Changeset 10966 in josm for trunk/test/unit/org/openstreetmap/josm

Timestamp:

2016-09-06T00:16:07+02:00 (8 years ago)

Author:

Don-vip

Message:

fix unit tests hanging on Jenkins

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• MainTest.java (modified) (2 diffs)
• actions/CreateMultipolygonActionTest.groovy (modified) (1 diff)
• actions/PurgeActionTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/MainTest.java

@@ -11 +11 @@
 import javax.swing.UIManager;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main.DownloadParamType;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -25 +26 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform();
 
     /**

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.groovy

@@ -12 +12 @@
 import org.openstreetmap.josm.tools.SubclassFilteredCollection
 
-class CreateMultipolygonActionTest {
+public class CreateMultipolygonActionTest {
 
     @BeforeClass

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

@@ -32 +32 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules test = new JOSMTestRules().platform().commands();
 
     /**