Changeset 12564 in josm for trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

Timestamp:

2017-08-03T23:24:56+02:00 (7 years ago)

Author:

Don-vip

Message:

fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -10 +10 @@
 import java.util.Map;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -28 +28 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -84 +86 @@
      * Setup tests.
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init(true);
-        ProjectionPreference.setProjection();
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform().projection().mainMenu();
+
+    /**
+     * Setup tests.
+     */
+    @Before
+    public void setUp() {
+        Main.getLayerManager().addLayer(createOsmLayer());
     }