Changeset 10945 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.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/validation/tests/MultipolygonTestTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java

@@ -15 +15 @@
 import java.util.TreeSet;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -26 +25 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -39 +40 @@
     /**
      * Setup test.
-     * @throws Exception if test cannot be initialized
      */
-    @BeforeClass
-    public static void setUp() throws Exception {
-        JOSMFixture.createUnitTestFixture().init(true);
-        MapPaintStyles.readFromPreferences();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().commands();
 
     private static Way createUnclosedWay(String tags) {