Changeset 10553 in josm for trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

Timestamp:

2016-07-17T14:54:06+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13079 - Use JOSMTestRules instead of JOSMFixture (tools tests, patch by michael2402) - gsoc-core

File:

• trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -6 +6 @@
 
 import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -21 +23 @@
  */
 public class GeometryTest {
-
     /**
-     * Setup test.
+     * Primitives need preferences and projection.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences().projection();
 
     /**