Changeset 12564 in josm for trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.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/gui/MapScalerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java

@@ -8 +8 @@
 import java.awt.Color;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MapScaler.AccessibleMapScaler;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -23 +27 @@
      * Setup tests
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init(true);
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().mainMenu().platform().projection();
 
     /**
@@ -33 +36 @@
     @Test
     public void testMapScaler() {
+        Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
         assertEquals(Color.WHITE, MapScaler.getColor());
         MapScaler ms = new MapScaler(Main.map.mapView);