Changeset 10973 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java

Timestamp:

2016-09-08T00:02:03+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13564 - proper management of invalid URLs in remote control handlers + add unit test

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandlerTest.java (modified) (8 diffs)

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

@@ -10 +10 @@
 import org.junit.Test;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
 
 /**
@@ -16 +17 @@
 public class RequestHandlerTest {
 
-    Map<String, String> getRequestParameter(String url) {
+    Map<String, String> getRequestParameter(String url) throws RequestHandlerBadRequestException {
         final RequestHandler req = new RequestHandler() {
             @Override
@@ -47 +48 @@
     /**
      * Test request parameter - case 1
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter1() {
+    public void testRequestParameter1() throws RequestHandlerBadRequestException {
         final Map<String, String> expected = new HashMap<>();
         expected.put("query", "a");
@@ -58 +60 @@
     /**
      * Test request parameter - case 2
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter2() {
+    public void testRequestParameter2() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singletonMap("query", "a&b==c"),
                 getRequestParameter("http://example.com/?query=a%26b==c"));
@@ -67 +70 @@
     /**
      * Test request parameter - case 3
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter3() {
+    public void testRequestParameter3() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singleton("blue+light blue"),
                 getRequestParameter("http://example.com/blue+light%20blue?blue%2Blight+blue").keySet());
@@ -78 +82 @@
      * @see <a href="http://blog.lunatech.com/2009/02/03/what-every-web-developer-must-know-about-url-encoding">
      *      What every web developer must know about URL encoding</a>
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter4() {
+    public void testRequestParameter4() throws RequestHandlerBadRequestException {
         assertEquals(Collections.singletonMap("/?:@-._~!$'()* ,;", "/?:@-._~!$'()* ,;=="), getRequestParameter(
                 // CHECKSTYLE.OFF: LineLength
@@ -89 +94 @@
     /**
      * Test request parameter - case 5
+     * @throws RequestHandlerBadRequestException never
      */
     @Test
-    public void testRequestParameter5() {
+    public void testRequestParameter5() throws RequestHandlerBadRequestException {
         final Map<String, String> expected = new HashMap<>();
         expected.put("space", " ");
@@ -97 +103 @@
         assertEquals(expected, getRequestParameter("http://example.com/?space=%20&tab=%09"));
     }
+
+    /**
+     * Test request parameter - invalid case
+     * @throws RequestHandlerBadRequestException always
+     */
+    @Test(expected = RequestHandlerBadRequestException.class)
+    public void testRequestParameterInvalid() throws RequestHandlerBadRequestException {
+        getRequestParameter("http://localhost:8111/load_and_zoom"+
+                "?addtags=wikipedia:de=Wei%C3%9Fe_Gasse|maxspeed=5"+
+                "&select=way23071688,way23076176,way23076177,"+
+                "&left=13.739727546842&right=13.740890970188&top=51.049987191025&bottom=51.048466954325");
+    }
 }