From 30fb1cc62d9fe421f47e449f756173bbd0129268 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 18 Mar 2018 12:15:59 +0000 Subject: [PATCH v2 09/28] AsynchronousUploadPrimitivesTaskTest: convert to use of JOptionPaneSimpleMocker won't yet have an effect until internal isHeadless() checks are removed --- .../josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java b/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java index b4f71654e..aae0700d7 100644 --- a/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java +++ b/test/unit/org/openstreetmap/josm/gui/io/AsynchronousUploadPrimitivesTaskTest.java @@ -2,6 +2,7 @@ package org.openstreetmap.josm.gui.io; import java.util.Optional; +import javax.swing.JOptionPane; import org.junit.After; import org.junit.Assert; @@ -17,6 +18,9 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.io.UploadStrategySpecification; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.JOptionPaneSimpleMocker; + +import com.google.common.collect.ImmutableMap; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -36,10 +40,14 @@ public class AsynchronousUploadPrimitivesTaskTest { */ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules(); + public JOSMTestRules test = new JOSMTestRules().assertionsInEDT(); @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(); Node node2 = new Node(); -- 2.11.0