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

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

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• io/AsynchronousUploadPrimitivesTaskTest.java (modified) (2 diffs)
• preferences/advanced/ExportProfileActionTest.java (modified) (2 diffs)
• preferences/advanced/PreferencesTableTest.java (modified) (2 diffs)
• preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java

@@ -11 +11 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -49 +50 @@
     @Before
     public void bootStrap() {
+        TestUtils.assumeWorkingJMockit();
         new JOptionPaneSimpleMocker(ImmutableMap.of(
             "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION

trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java

@@ -7 +7 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
@@ -30 +31 @@
     @Test
     public void testAction() {
+        TestUtils.assumeWorkingJMockit();
         new JOptionPaneSimpleMocker(ImmutableMap.of(
             "All the preferences of this group are default, nothing to save", JOptionPane.OK_OPTION

trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTableTest.java

@@ -13 +13 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable.AllSettingsTableModel;
@@ -50 +51 @@
     @Test
     public void testPreferencesTable() {
+        TestUtils.assumeWorkingJMockit();
         new JOptionPaneSimpleMocker(ImmutableMap.of(
             "Please select the row to edit.", JOptionPane.OK_OPTION,

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -39 +39 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import mockit.MockUp;
 
 /**
@@ -393 +394 @@
     @Test
     public void testUpdateOnlySelectedPlugin() throws Exception {
+        TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceDummyJarNew),
@@ -586 +588 @@
     @Test
     public void testUpdateWithNoAvailableUpdates() throws Exception {
+        TestUtils.assumeWorkingJMockit();
         final PluginServer pluginServer = new PluginServer(
             new PluginServer.RemotePlugin(this.referenceDummyJarOld),
@@ -724 +727 @@
     @Test
     public void testInstallWithoutRestartRequired() throws Exception {
+        TestUtils.assumeWorkingJMockit();
         final boolean[] loadPluginsCalled = new boolean[] {false};
-        new mockit.MockUp<PluginHandler>() {
+        new MockUp<PluginHandler>() {
             @mockit.Mock
             private void loadPlugins(