Changeset 12568 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2017-08-04T20:03:38+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit test

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• dialogs/InspectPrimitiveDialogTest.java (modified) (1 diff)
• layer/GpxLayerTest.java (modified) (2 diffs)
• tagging/presets/items/PresetLinkTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java

@@ -31 +31 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().mainMenu().platform().projection();
+    public JOSMTestRules test = new JOSMTestRules().mainMenu().platform().projection().mapStyles();
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

@@ -41 +41 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().mainMenu().projection();
+    public JOSMTestRules test = new JOSMTestRules().platform().mainMenu().projection().i18n();
 
     private static String getHtml(GpxLayer layer) {
@@ -146 +146 @@
                      "        </td>\n" +
                      "        <td>\n" +
-                     "          1/3/16 12:59 PM - 1:00 PM (0:00)\n" +
+                     "          1/3/16 11:59 AM - 12:00 PM (0:00)\n" +
                      "        </td>\n" +
                      "        <td>\n" +

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

@@ -10 +10 @@
 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.gui.tagging.presets.TaggingPresets;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -24 +25 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-        TaggingPresets.readFromPreferences();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules rule = new JOSMTestRules().presets();
 
     /**