Changeset 19155 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2024-07-29T17:57:38+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix tests broken by r19152

Location:

trunk/test/unit/org/openstreetmap/josm/actions

Files:

• AddImageryLayerActionTest.java (modified) (5 diffs)
• downloadtasks/AbstractDownloadTaskTestParent.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java

@@ -10 +10 @@
 import java.util.List;
 
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
@@ -21 +22 @@
 import org.openstreetmap.josm.testutils.annotations.Projection;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 /**
  * Unit tests for class {@link AddImageryLayerAction}.
@@ -31 +30 @@
 @Projection
 final class AddImageryLayerActionTest {
-    /**
-     * HTTP mock.
-     */
-    @BasicWiremock
-    WireMockServer wireMockServer;
-
     /**
      * Unit test of {@link AddImageryLayerAction#updateEnabledState}.
@@ -65 +58 @@
      */
     @Test
-    void testActionPerformedEnabledWms() {
-        wireMockServer.stubFor(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.1.1"))
+    void testActionPerformedEnabledWms(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        wireMockRuntimeInfo.getWireMock().register(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.1.1"))
                 .willReturn(aResponse()
                         .withStatus(200)
                         .withHeader("Content-Type", "text/xml")
                         .withBodyFile("imagery/wms-capabilities.xml")));
-        wireMockServer.stubFor(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities"))
+        wireMockRuntimeInfo.getWireMock().register(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities"))
                 .willReturn(aResponse()
                         .withStatus(404)));
-        wireMockServer.stubFor(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0"))
+        wireMockRuntimeInfo.getWireMock().register(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0"))
                 .willReturn(aResponse()
                         .withStatus(404)));
@@ -80 +73 @@
         try {
             FeatureAdapter.registerApiKeyAdapter(id -> "random_key");
-            final ImageryInfo imageryInfo = new ImageryInfo("localhost", wireMockServer.url("/wms?apikey={apikey}"),
+            final ImageryInfo imageryInfo = new ImageryInfo("localhost", wireMockRuntimeInfo.getHttpBaseUrl() + "/wms?apikey={apikey}",
                     "wms_endpoint", null, null);
             imageryInfo.setId("testActionPerformedEnabledWms");

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTestParent.java

@@ -6 +6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import org.junit.jupiter.api.BeforeEach;
 import org.openstreetmap.josm.testutils.annotations.BasicWiremock;
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
 
 /**
@@ -17 +17 @@
 @HTTPS
 public abstract class AbstractDownloadTaskTestParent {
-    /**
-     * HTTP mock.
-     */
-    @BasicWiremock
-    WireMockServer wireMockServer;
+    WireMockRuntimeInfo wireMockServer;
+    @BeforeEach
+    void setup(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        this.wireMockServer = wireMockRuntimeInfo;
+    }
 
     /**
@@ -43 +43 @@
      */
     protected final String getRemoteFileUrl() {
-        return wireMockServer.url(getRemoteFile());
+        final String remote = getRemoteFile();
+        if (remote.startsWith("/")) {
+            return wireMockServer.getHttpBaseUrl() + getRemoteFile();
+        }
+        return wireMockServer.getHttpBaseUrl() + '/' + getRemoteFile();
     }
 
@@ -50 +54 @@
      */
     protected final void mockHttp() {
-        wireMockServer.stubFor(get(urlEqualTo("/" + getRemoteFile()))
+        wireMockServer.getWireMock().register(get(urlEqualTo("/" + getRemoteFile()))
                 .willReturn(aResponse()
                     .withStatus(200)