Changeset 9732 in josm for trunk

Timestamp:

2016-02-04T00:48:38+01:00 (8 years ago)

Author:

Don-vip

Message:

remote control: add more unit tests, robustness

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java (added)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -273 +273 @@
                 //
                 final OsmDataLayer layer = createNewLayer(newLayerName);
-                Main.main.addLayer(layer, computeBbox(bounds));
+                if (Main.main != null)
+                    Main.main.addLayer(layer, computeBbox(bounds));
                 return layer;
             }

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -122 +123 @@
             }
 
+            if ("file".equals(url.getProtocol())) {
+                try {
+                    return url.openStream();
+                } catch (IOException e) {
+                    throw new OsmTransferException(e);
+                }
+            }
+
             final HttpClient client = HttpClient.create(url);
             activeConnection = client;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -115 +115 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         try {
-            lat = Double.parseDouble(args.get("lat"));
-            lon = Double.parseDouble(args.get("lon"));
+            lat = Double.parseDouble(args != null ? args.get("lat") : "");
+            lon = Double.parseDouble(args != null ? args.get("lon") : "");
         } catch (NumberFormatException e) {
             throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+')', e);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -98 +98 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        String urlString = args.get("url");
+        String urlString = args != null ? args.get("url") : null;
         if (Main.pref.getBoolean("remotecontrol.importhandler.fix_url_query", true)) {
             urlString = Utils.fixURLQuery(urlString);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -223 +223 @@
         List<String> missingKeys = new LinkedList<>();
         boolean error = false;
-        if (mandatory != null) for (String key : mandatory) {
-            String value = args.get(key);
-            if (value == null || value.isEmpty()) {
-                error = true;
-                Main.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");
-                missingKeys.add(key);
+        if (mandatory != null && args != null) {
+            for (String key : mandatory) {
+                String value = args.get(key);
+                if (value == null || value.isEmpty()) {
+                    error = true;
+                    Main.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");
+                    missingKeys.add(key);
+                }
             }
         }
         Set<String> knownParams = new HashSet<>();
-        if (mandatory != null) Collections.addAll(knownParams, mandatory);
-        if (optional != null) Collections.addAll(knownParams, optional);
-        for (String par: args.keySet()) {
-            if (!knownParams.contains(par)) {
-                Main.warn("Unknown remote control parameter {0}, skipping it", par);
+        if (mandatory != null)
+            Collections.addAll(knownParams, mandatory);
+        if (optional != null)
+            Collections.addAll(knownParams, optional);
+        if (args != null) {
+            for (String par: args.keySet()) {
+                if (!knownParams.contains(par)) {
+                    Main.warn("Unknown remote control parameter {0}, skipping it", par);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1221 +1221 @@
      */
     public static String fixURLQuery(String url) {
-        if (url.indexOf('?') == -1)
+        if (url == null || url.indexOf('?') == -1)
             return url;
 

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -12 +23 @@
 
     /**
+     * Rule used for tests throwing exceptions.
+     */
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init(true);
+    }
+
+    private static ImportHandler newHandler(String url) {
+        ImportHandler req = new ImportHandler();
+        if (url != null)
+            req.setUrl(url);
+        return req;
+    }
+
+    /**
      * Non-regression test for bug #7434.
      */
     @Test
     public void testTicket7434() {
-        final ImportHandler req = new ImportHandler();
-        req.setUrl("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive");
+        ImportHandler req = newHandler("http://localhost:8111/import?url=http://localhost:8888/relations?relations=19711&mode=recursive");
         assertEquals("http://localhost:8888/relations?relations=19711&mode=recursive", req.args.get("url"));
     }
+
+    /**
+     * Unit test for bad request - no param.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testBadRequestNoParam() throws Exception {
+        thrown.expect(RequestHandlerBadRequestException.class);
+        thrown.expectMessage("MalformedURLException: null");
+        newHandler(null).handle();
+    }
+
+    /**
+     * Unit test for bad request - invalid URL.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testBadRequestInvalidUrl() throws Exception {
+        thrown.expect(RequestHandlerBadRequestException.class);
+        thrown.expectMessage("MalformedURLException: no protocol: invalid_url");
+        newHandler("https://localhost?url=invalid_url").handle();
+    }
+
+    /**
+     * Unit test for bad request - incomplete URL.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testBadRequestIncompleteUrl() throws Exception {
+        thrown.expect(RequestHandlerBadRequestException.class);
+        thrown.expectMessage("The following keys are mandatory, but have not been provided: url");
+        newHandler("https://localhost").handle();
+    }
+
+    /**
+     * Unit test for nominal request - local data file.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testNominalRequest() throws Exception {
+        String url = new File(TestUtils.getRegressionDataFile(11957, "data.osm")).toURI().toURL().toExternalForm();
+        try {
+            newHandler("https://localhost?url=" + Utils.encodeUrl(url)).handle();
+        } finally {
+            for (OsmDataLayer layer : Main.map.mapView.getLayersOfType(OsmDataLayer.class)) {
+                Main.main.removeLayer(layer);
+            }
+        }
+    }
 }