Changeset 10945 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

Timestamp:

2016-09-03T14:22:22+02:00 (8 years ago)

Author:

Don-vip

Message:

convert more unit tests to JOSMTestRules

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -9 +9 @@
 import java.net.MalformedURLException;
 
-import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -40 +42 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
 
     private static ImageryInfo getImagery(String path) {