Changeset 14052 in josm for trunk/test/unit/org/openstreetmap/josm/gui/io

Timestamp:

2018-07-26T22:01:31+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16010 - use JMockit to enable more extensive test coverage (patch by ris, modified)

see ​https://github.com/openstreetmap/josm/pull/24/commits for details

File:

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

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

@@ -3 +3 @@
 
 import java.util.Optional;
+
+import javax.swing.JOptionPane;
 
 import org.junit.After;
@@ -18 +20 @@
 import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
+
+import com.google.common.collect.ImmutableMap;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -37 +42 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().assertionsInEDT();
 
+    /**
+     * Bootstrap.
+     */
     @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();
@@ -60 +72 @@
     }
 
+    /**
+     * Tear down.
+     */
     @After
     public void tearDown() {
@@ -70 +85 @@
     }
 
+    /**
+     * Test single upload instance.
+     */
     @Test
     public void testSingleUploadInstance() {