Ticket #12977: patch-tests-use-rules-NavigatableComponentTest.2.patch

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

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Unit tests for class {@link AddImageryLayerAction}.
  */
@@ -23 +25 @@
      * We need prefs for this. We need platform for actions and the OSM API for checking blacklist.
      */
     @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences().platform().fakeAPI();
 
     /**

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

@@ -12 +12 @@
 
 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;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 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;
 
 /**
  * Some tests for the {@link NavigatableComponent} class.
@@ -34 +36 @@
     private NavigatableComponent component;
 
     /**
-     * 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();
 
     /**
      * Create a new, fresh {@link NavigatableComponent}

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

@@ -11 +11 @@
 import org.junit.runners.model.InitializationError;
 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;
 import org.openstreetmap.josm.io.OsmApi;
@@ -34 +35 @@
     private APIType useAPI = APIType.NONE;
     private String i18n = null;
     private boolean platform;
+    private boolean useProjection;
 
     /**
      * Disable the default timeout for this test. Use with care.
@@ -119 +121 @@
         return this;
     }
 
+    /**
+     * Set up default projection (Mercator)
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules projection() {
+        useProjection = true;
+        return this;
+    }
+
     @Override
     public Statement apply(final Statement base, Description description) {
         Statement statement = new Statement() {
@@ -173 +184 @@
             Main.pref.put("osm-server.url", "http://invalid");
         }
 
+        if (useProjection) {
+            Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        }
+
         // Set API
         if (useAPI == APIType.DEV) {
             Main.pref.put("osm-server.url", "http://api06.dev.openstreetmap.org/api");
@@ -213 +228 @@
         }
 
         // TODO: Remove global listeners and other global state.
-
         Main.pref = null;
         Main.platform = null;
         // Parts of JOSM uses weak references - destroy them.