Changeset 10116 in josm

Timestamp:

2016-04-07T00:39:57+02:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java (added)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java (added)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java (added)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandlerTest.java (added)

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

@@ -95 +95 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         allCoordinates.clear();
-        for (String coordinatesString : args.get("way").split(";\\s*")) {
+        for (String coordinatesString : (args != null ? args.get("way") : "").split(";\\s*")) {
             String[] coordinates = coordinatesString.split(",\\s*", 2);
             if (coordinates.length < 2) {

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

@@ -116 +116 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        String url = args.get("url");
-        String type = args.get("type");
-        String cookies = args.get("cookies");
+        String url = args != null ? args.get("url") : null;
+        String type = args != null ? args.get("type") : null;
+        String cookies = args != null ? args.get("cookies") : null;
         try {
             ImageryLayer.create(new ImageryInfo(null, url, type, null, cookies));

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

@@ -269 +269 @@
         maxlon = 0;
         try {
-            minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("bottom")));
-            maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("top")));
-            minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("left")));
-            maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args.get("right")));
+            minlat = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("bottom") : ""));
+            maxlat = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("top") : ""));
+            minlon = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("left") : ""));
+            maxlon = LatLon.roundToOsmPrecision(Double.parseDouble(args != null ? args.get("right") : ""));
         } catch (NumberFormatException e) {
             throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+')', e);

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

@@ -105 +105 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         ps.clear();
-        for (String i : args.get("objects").split(",\\s*")) {
+        for (String i : (args != null ? args.get("objects") : "").split(",\\s*")) {
             try {
                 ps.add(SimplePrimitiveId.fromString(i));