Changeset 14187 in josm for trunk

Timestamp:

2018-08-28T00:35:09+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - fix JMockit failure on Java 11+

File:

• trunk/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java (modified) (3 diffs)

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

@@ -50 +50 @@
     @Before
     public void bootStrap() {
-        new JOptionPaneSimpleMocker(ImmutableMap.of(
-            "A background upload is already in progress. Kindly wait for it to finish before uploading new changes", JOptionPane.OK_OPTION
-        ));
-
         DataSet dataSet = new DataSet();
         Node node1 = new Node();
@@ -82 +78 @@
         strategy = null;
         changeset = null;
-        uploadPrimitivesTask.cancel();
+        if (uploadPrimitivesTask != null) {
+            uploadPrimitivesTask.cancel();
+        }
         uploadPrimitivesTask = null;
     }
@@ -92 +90 @@
     public void testSingleUploadInstance() {
         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
+            ));
         Optional<AsynchronousUploadPrimitivesTask> task = AsynchronousUploadPrimitivesTask.
                 createAsynchronousUploadTask(strategy, layer, toUpload, changeset);