Changeset 14332 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx

Timestamp:

2018-10-14T17:30:28+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16841 - MergeLayerActionTest, DownloadWmsAlongTrackActionTest: fix for non-headless mode by properly mocking dialogs (patch by ris)

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

@@ -3 +3 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -10 +11 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.actions.MergeLayerActionTest.MergeLayerExtendedDialogMocker;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -15 +17 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.gpx.DownloadWmsAlongTrackAction.PrecacheWmsTask;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.TileSourceRule;
+import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
+
+import com.google.common.collect.ImmutableMap;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -37 +43 @@
     @Test
     public void testNoLayer() {
+        TestUtils.assumeWorkingJMockit();
+        final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker(
+            ImmutableMap.<String, Object>of("There are no imagery layers.", 0)
+        );
+
         assertNull(new DownloadWmsAlongTrackAction(new GpxData()).createTask());
+
+        assertEquals(1, jopsMocker.getInvocationLog().size());
+        Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0);
+        assertEquals(0, (int) invocationLogEntry[0]);
+        assertEquals("No imagery layers", invocationLogEntry[2]);
     }
 
@@ -46 +62 @@
     @Test
     public void testTMSLayer() throws Exception {
+        TestUtils.assumeWorkingJMockit();
+        final MergeLayerExtendedDialogMocker edMocker = new MergeLayerExtendedDialogMocker();
+        edMocker.getMockResultMap().put("Please select the imagery layer.", "Download");
+
         final TileSourceRule tileSourceRule = this.test.getTileSourceRule();
 
@@ -65 +85 @@
             MainApplication.getLayerManager().removeLayer(layer);
         }
+
+        assertEquals(1, edMocker.getInvocationLog().size());
+        Object[] invocationLogEntry = edMocker.getInvocationLog().get(0);
+        assertEquals(1, (int) invocationLogEntry[0]);
+        assertEquals("Select imagery layer", invocationLogEntry[2]);
     }
 }