Changeset 16282 in josm

Timestamp:

2020-04-12T22:31:36+02:00 (4 years ago)

Author:

simon04

Message:

see #8352, see #19075 - Presets: fix unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -101 +101 @@
             combobox.setSelectedItem(originalValue);
         }
-        if ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour")) {
+        if (key != null && ("colour".equals(key) || key.startsWith("colour:") || key.endsWith(":colour"))) {
             p.add(combobox, GBC.std().fill(GBC.HORIZONTAL));
             JButton button = new JButton(new ChooseColorAction());

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/CheckTest.java

@@ -9 +9 @@
 import javax.swing.JPanel;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -22 +24 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().main();
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java

@@ -9 +9 @@
 import javax.swing.JPanel;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -22 +24 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().main();
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/TextTest.java

@@ -9 +9 @@
 import javax.swing.JPanel;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -22 +24 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().main();
 
     /**