Changeset 14081 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2018-08-04T01:59:46+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - Ignore tests using JMockit on Java 11+, workaround to ​https://github.com/jmockit/jmockit1/issues/534

File:

• trunk/test/unit/org/openstreetmap/josm/actions/ExitActionTest.java (modified) (4 diffs)

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

@@ -7 +7 @@
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.swing.ProgressMonitorExecutor;
@@ -12 +13 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import mockit.Invocation;
 import mockit.Mock;
 import mockit.MockUp;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -28 +28 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules test = new JOSMTestRules().platform().main();
 
     /**
@@ -41 +41 @@
     @Test
     public void testActionPerformed() {
+        TestUtils.assumeWorkingJMockit();
         exit.expectSystemExitWithStatus(0);