Changeset 10402 in josm for trunk/test/unit

Timestamp:

2016-06-16T16:37:27+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12977 - Use test rules for NavigatableComponentTest (patch by michael2402) - gsoc-core

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/AddImageryLayerActionTest.java (modified) (2 diffs)
• gui/NavigatableComponentTest.java (modified) (3 diffs)
• testutils/JOSMTestRules.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Unit tests for class {@link AddImageryLayerAction}.
@@ -24 +26 @@
      */
     @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences().platform().fakeAPI();
 

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

@@ -13 +13 @@
 import org.CustomMatchers;
 import org.junit.Before;
-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.data.Bounds;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -35 +37 @@
 
     /**
-     * Setup test.
+     * We need the projection for coordinate conversions.
      */
-    @BeforeClass
-    public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().platform().projection();
 
     /**

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -12 +12 @@
 import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -35 +36 @@
     private String i18n = null;
     private boolean platform;
+    private boolean useProjection;
 
     /**
@@ -117 +119 @@
     public JOSMTestRules fakeAPI() {
         useAPI = APIType.FAKE;
+        return this;
+    }
+
+    /**
+     * Set up default projection (Mercator)
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules projection() {
+        useProjection = true;
         return this;
     }
@@ -174 +185 @@
         }
 
+        if (useProjection) {
+            Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        }
+
         // Set API
         if (useAPI == APIType.DEV) {
@@ -214 +229 @@
 
         // TODO: Remove global listeners and other global state.
-
         Main.pref = null;
         Main.platform = null;