Changeset 10553 in josm for trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.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/PredicatesTest.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.util.regex.Pattern;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -24 +26 @@
 public class PredicatesTest {
     /**
-     * Not needed by this test, but JOSM has so many dependencies :-(
-     */
-    @BeforeClass
-    public static void setUpClass() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+     * Some of this depends on preferences.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**