Changeset 19052 in josm

Timestamp:

2024-04-22T21:43:15+02:00 (2 weeks ago)

Author:

taylor.smock

Message:

Fix some wiremock tests -- wiremock no longer considers // to be a valid URI.

From history, it appears that this may have been a typo (any URL to //maps).

Location:

trunk/test/unit/org/openstreetmap/josm/data/imagery

Files:

• WMSEndpointTileSourceTest.java (modified) (4 diffs)
• WMTSTileSourceTest.java (modified) (2 diffs)

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

@@ -68 +68 @@
                 );
 
-        tileServer.stubFor(WireMock.get(WireMock.urlEqualTo("//maps")).willReturn(WireMock.aResponse().withBody(
+        tileServer.stubFor(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" +
@@ -95 +95 @@
                 )));
 
-        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("//maps")));
+        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("/other/maps")));
         ImageryLayerInfo.instance.loadDefaults(true, null, false);
         assertEquals(1, ImageryLayerInfo.instance.getDefaultLayers().size());
@@ -118 +118 @@
                 );
 
-        tileServer.stubFor(WireMock.get(WireMock.urlEqualTo("//maps")).willReturn(WireMock.aResponse().withBody(
+        tileServer.stubFor(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" +
@@ -141 +141 @@
                 )));
 
-        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("//maps")));
+        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("/other/maps")));
         ImageryLayerInfo.instance.loadDefaults(true, null, false);
         ImageryInfo wmsImageryInfo = ImageryLayerInfo.instance.getDefaultLayers().get(0);

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

@@ -382 +382 @@
 
         tileServer.stubFor(
-                WireMock.get("//maps")
+                WireMock.get("/other/maps")
                 .willReturn(
                         WireMock.aResponse().withBody(
@@ -400 +400 @@
                 )));
 
-        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("//maps")));
+        Config.getPref().putList("imagery.layers.sites", Collections.singletonList(tileServer.url("/other/maps")));
         ImageryLayerInfo.instance.loadDefaults(true, null, false);