Changeset 12562 in josm for trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java

Timestamp:

2017-08-03T19:57:36+02:00 (9 years ago)

Author:

Don-vip

Message:

speedup unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertTrue;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -26 +29 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init(true);
-        action = Main.main.menu.unglueNodes;
-        action.setEnabled(true);
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().mainMenu();
+
+    /**
+     * Setup test.
+     */
+    @Before
+    public void setUp() {
+        if (action == null) {
+            action = Main.main.menu.unglueNodes;
+            action.setEnabled(true);
+        }
     }