Changeset 11988 in josm

Timestamp:

2017-04-23T21:49:05+02:00 (7 years ago)

Author:

Don-vip

Message:

improve unit test for Main.postConstructorProcessCmdLine

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/MainTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1002 +1002 @@
          */
         List<Future<?>> downloadGps(String param) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("Parameter \"downloadgps\" does not accept file names or file URLs"),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE
-            );
+            if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(
+                        Main.parent,
+                        tr("Parameter \"downloadgps\" does not accept file names or file URLs"),
+                        tr("Warning"),
+                        JOptionPane.WARNING_MESSAGE
+                );
+            }
             return Collections.emptyList();
         }

trunk/test/unit/org/openstreetmap/josm/MainTest.java

@@ -8 +8 @@
 import static org.junit.Assert.assertTrue;
 
+import java.net.MalformedURLException;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.List;
@@ -96 +98 @@
     }
 
-    /**
-     * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal cases.
-     * This test assumes the DEV API contains nodes around 0,0 and GPX tracks around London
-     */
-    @Test
-    public void testPostConstructorProcessCmdLineNominal() {
+    private static void doTestPostConstructorProcessCmdLine(String download, String downloadGps, boolean gpx) {
         assertNull(Main.getLayerManager().getEditDataSet());
         Main.postConstructorProcessCmdLine(new ProgramArguments(new String[]{
-                "--download=0.01,0.01,0.05,0.05",
-                "--downloadgps=51.35,-0.4,51.60,0.2",
+                "--download=" + download,
+                "--downloadgps=" + downloadGps,
                 "--selection=type: node"}));
         DataSet ds = Main.getLayerManager().getEditDataSet();
@@ -111 +108 @@
         assertFalse(ds.getSelected().isEmpty());
         Main.getLayerManager().removeLayer(Main.getLayerManager().getEditLayer());
-        List<GpxLayer> gpxLayers = Main.getLayerManager().getLayersOfType(GpxLayer.class);
-        assertEquals(1, gpxLayers.size());
-        Main.getLayerManager().removeLayer(gpxLayers.iterator().next());
+        if (gpx) {
+            List<GpxLayer> gpxLayers = Main.getLayerManager().getLayersOfType(GpxLayer.class);
+            assertEquals(1, gpxLayers.size());
+            Main.getLayerManager().removeLayer(gpxLayers.iterator().next());
+        }
+    }
+
+    /**
+     * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with bounds.
+     * This test assumes the DEV API contains nodes around 0,0 and GPX tracks around London
+     */
+    @Test
+    public void testPostConstructorProcessCmdLineBounds() {
+        doTestPostConstructorProcessCmdLine(
+                "0.01,0.01,0.05,0.05",
+                "51.35,-0.4,51.60,0.2", true);
+    }
+
+    /**
+     * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with http/https URLs.
+     * This test assumes the DEV API contains nodes around 0,0 and GPX tracks around London
+     */
+    @Test
+    public void testPostConstructorProcessCmdLineHttpUrl() {
+        doTestPostConstructorProcessCmdLine(
+                "http://api06.dev.openstreetmap.org/api/0.6/map?bbox=0.01,0.01,0.05,0.05",
+                "https://master.apis.dev.openstreetmap.org/api/0.6/trackpoints?bbox=-0.4,51.35,0.2,51.6&page=0", true);
+    }
+
+    /**
+     * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with file URLs.
+     * @throws MalformedURLException if an error occurs
+     */
+    @Test
+    public void testPostConstructorProcessCmdLineFileUrl() throws MalformedURLException {
+        doTestPostConstructorProcessCmdLine(
+                Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toUri().toURL().toExternalForm(),
+                Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toUri().toURL().toExternalForm(), false);
+    }
+
+    /**
+     * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with file names.
+     * @throws MalformedURLException if an error occurs
+     */
+    @Test
+    public void testPostConstructorProcessCmdLineFilename() throws MalformedURLException {
+        doTestPostConstructorProcessCmdLine(
+                Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toFile().getAbsolutePath(),
+                Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toFile().getAbsolutePath(), false);
     }