Changeset 17332 in josm for trunk/test

Timestamp:

2020-11-23T16:01:19+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20131 - fix unit tests and codestyle violations

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (3 diffs)
• io/remotecontrol/handler/LoadObjectHandlerTest.java (modified) (3 diffs)

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

@@ -480 +480 @@
 
     /**
-     * Return WireMock server serving files under ticker directory
+     * Return WireMock server serving files under ticket directory
      * @param ticketId Ticket numeric identifier
      * @return WireMock HTTP server on dynamic port
@@ -493 +493 @@
 
     /**
-     * Return WireMock server serving files under ticker directory
+     * Return WireMock server
      * @return WireMock HTTP server on dynamic port
      */
@@ -499 +499 @@
             return new WireMockServer(
                     WireMockConfiguration.options()
+                        .withRootDirectory("test/data")
                         .dynamicPort()
                     );

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol.handler;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -36 +43 @@
     @Test
     void testBadRequestNoParam() {
-        assertDoesNotThrow(() -> newHandler(null).handle());
+        Exception e = assertThrows(RequestHandlerBadRequestException.class, () -> newHandler(null).handle());
+        assertEquals("No valid object identifier has been provided", e.getMessage());
     }
 
@@ -62 +70 @@
     @Test
     void testNominalRequest() {
-        assertDoesNotThrow(() -> newHandler("https://localhost?objects=foo,bar").handle());
+        WireMockServer wiremock = TestUtils.getWireMockServer();
+        wiremock.addStubMapping(get(urlEqualTo("/capabilities")).willReturn(aResponse().withStatusMessage("OK")
+                .withBodyFile("api/capabilities")).build());
+        String w1 = "<way id=\"1\" version=\"1\"><nd ref=\"1\"/><nd ref=\"2\"/></way>";
+        String n1 = "<node id=\"1\" version=\"1\"/>";
+        String n2 = "<node id=\"2\" version=\"1\"/>";
+        wiremock.addStubMapping(get(urlEqualTo("/0.6/ways?ways=1")).willReturn(aResponse().withStatusMessage("OK")
+                .withBody(osm(w1))).build());
+        wiremock.addStubMapping(get(urlEqualTo("/0.6/nodes?nodes=1,2")).willReturn(aResponse().withStatusMessage("OK")
+                .withBody(osm(n1 + n2))).build());
+        wiremock.addStubMapping(get(urlEqualTo("/0.6/way/1/full")).willReturn(aResponse().withStatusMessage("OK")
+                .withBody(osm(n1 + n2 + w1))).build());
+        wiremock.start();
+        Config.getPref().put("osm-server.url", wiremock.baseUrl());
+        try {
+            assertDoesNotThrow(() -> newHandler("https://localhost?objects=n1,w1").handle());
+        } finally {
+            wiremock.stop();
+        }
+    }
+
+    private static String osm(String xml) {
+        return "<osm version=\"0.6\">" + xml + "</osm>";
     }
 }