Changeset 19155 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java

Timestamp:

2024-07-29T17:57:38+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix tests broken by r19152

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java (modified) (13 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java

@@ -11 +11 @@
 import java.util.Collections;
 
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
@@ -22 +24 @@
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.WireMock;
 
@@ -29 +30 @@
 @Projection
 class WMSEndpointTileSourceTest implements TileSourceTest {
-    @BasicWiremock
-    WireMockServer tileServer;
+    WireMockRuntimeInfo tileServer;
+    @BeforeEach
+    void setup(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        this.tileServer = wireMockRuntimeInfo;
+    }
 
     private void basicMock() {
         final byte[] response = assertDoesNotThrow(() -> Files.readAllBytes(
                 Paths.get(TestUtils.getTestDataRoot() + "wms/geofabrik-osm-inspector.xml")));
-        tileServer.stubFor(
+        tileServer.getWireMock().register(
                 WireMock.get(WireMock.urlEqualTo("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities"))
                         .willReturn(WireMock.aResponse().withBody(response))
@@ -45 +49 @@
         this.basicMock();
         final ImageryInfo info = new ImageryInfo("WMSEndpointTileSourceTest");
-        info.setExtendedUrl(tileServer.url("/capabilities"));
+        info.setExtendedUrl(tileServer.getHttpBaseUrl() + "/capabilities");
         info.setDefaultLayers(Collections.singletonList(new DefaultLayer(ImageryType.WMS_ENDPOINT,
                 "single_node_in_way", "default", null)));
@@ -60 +64 @@
     void testDefaultLayerSetInMaps() throws Exception {
 
-        tileServer.stubFor(
+        tileServer.getWireMock().register(
                 WireMock.get(WireMock.urlEqualTo("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities"))
                 .willReturn(
@@ -68 +72 @@
                 );
 
-        tileServer.stubFor(WireMock.get(WireMock.urlEqualTo("/other/maps")).willReturn(WireMock.aResponse().withBody(
+        tileServer.getWireMock().register(WireMock.get(WireMock.urlEqualTo("/other/maps")).willReturn(WireMock.aResponse().withBody(
                 "<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<imagery xmlns=\"http://josm.openstreetmap.de/maps-1.0\">\n" +
@@ -76 +80 @@
                 "<type>wms_endpoint</type>\n" +
                 "<category>qa</category>\n" +
-                "<url><![CDATA[" + tileServer.url("/capabilities") + "]]></url>\n" +
+                "<url><![CDATA[" + tileServer.getHttpBaseUrl() + "/capabilities]]></url>\n" +
                 "<icon>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsSAAALEgHS3X78AAAB5UlEQVQ4y4WTwWsTURDG" +
                 "fy8W1yYmXZOqtGJJFyGw6KF7CEigwYuS0kthrYUi4i0iORS9BU9hQdA/ILcixVBrwENKLz1FUBB0wWOwYFAqxUNYTZq6BfM8yC5d05iBObz3vfnmm3kz4sqDh/zP" +
@@ -95 +99 @@
                 )));
 
-        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("/other/maps")));
+        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.getHttpBaseUrl() + "/other/maps"));
         ImageryLayerInfo.instance.loadDefaults(true, null, false);
         assertEquals(1, ImageryLayerInfo.instance.getDefaultLayers().size());
@@ -110 +114 @@
     @Test
     void testCustomHeadersServerSide() throws IOException {
-        tileServer.stubFor(
+        tileServer.getWireMock().register(
                 WireMock.get(WireMock.urlEqualTo("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities"))
                 .willReturn(
@@ -118 +122 @@
                 );
 
-        tileServer.stubFor(WireMock.get(WireMock.urlEqualTo("/other/maps")).willReturn(WireMock.aResponse().withBody(
+        tileServer.getWireMock().register(WireMock.get(WireMock.urlEqualTo("/other/maps")).willReturn(WireMock.aResponse().withBody(
                 "<?xml version='1.0' encoding='UTF-8'?>\n" +
                 "<imagery xmlns=\"http://josm.openstreetmap.de/maps-1.0\">\n" +
@@ -129 +133 @@
                 "        <country-code>NO</country-code>\n" +
                 "        <description lang=\"en\">Historic Norwegian orthophotos and maps, courtesy of Geovekst and Norkart.</description>\n" +
-                "        <url><![CDATA[" + tileServer.url("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities") + "]]></url>\n" +
+                "        <url><![CDATA[" + tileServer.getHttpBaseUrl() + "/capabilities?SERVICE=WMS&REQUEST=GetCapabilities]]></url>\n" +
                 "        <custom-http-header header-name=\"X-WAAPI-TOKEN\" header-value=\"b8e36d51-119a-423b-b156-d744d54123d5\" />\n" +
                 "        <attribution-text>© Geovekst</attribution-text>\n" +
@@ -141 +145 @@
                 )));
 
-        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("/other/maps")));
+        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.getHttpBaseUrl() + "/other/maps"));
         ImageryLayerInfo.instance.loadDefaults(true, null, false);
         ImageryInfo wmsImageryInfo = ImageryLayerInfo.instance.getDefaultLayers().get(0);
@@ -150 +154 @@
         assertEquals("b8e36d51-119a-423b-b156-d744d54123d5", tileSource.getHeaders().get("X-WAAPI-TOKEN"));
         assertTrue(wmsImageryInfo.isGeoreferenceValid());
-        tileServer.verify(
+        tileServer.getWireMock().verifyThat(
                 WireMock.getRequestedFor(WireMock.urlEqualTo("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities"))
                 .withHeader("X-WAAPI-TOKEN", WireMock.equalTo("b8e36d51-119a-423b-b156-d744d54123d5")));