Changeset 18630 in josm for trunk

Timestamp:

2023-01-11T14:31:19+01:00 (16 months ago)

Author:

taylor.smock

Message:

see r18628: {apikey} fails for Swedish historic orthophoto endpoint imagery

This fixes and adapts a test for WMS endpoints

File:

• trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -35 +36 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().fakeAPI();
+    public JOSMTestRules test = new JOSMTestRules().fakeAPI().projection();
 
     /**
@@ -72 +73 @@
     @Test
     void testActionPerformedEnabledWms() {
-        wireMockServer.stubFor(get(urlEqualTo("/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.1.1"))
+        wireMockServer.stubFor(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?SERVICE=WMS&REQUEST=GetCapabilities"))
+        wireMockServer.stubFor(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities"))
                 .willReturn(aResponse()
                         .withStatus(404)));
-        wireMockServer.stubFor(get(urlEqualTo("/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0"))
+        wireMockServer.stubFor(get(urlEqualTo("/wms?apikey=random_key&SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0"))
                 .willReturn(aResponse()
                         .withStatus(404)));
 
-        new AddImageryLayerAction(new ImageryInfo("localhost", wireMockServer.url("/wms?"),
-                "wms_endpoint", null, null)).actionPerformed(null);
-        List<WMSLayer> wmsLayers = MainApplication.getLayerManager().getLayersOfType(WMSLayer.class);
-        assertEquals(1, wmsLayers.size());
+        try {
+            FeatureAdapter.registerApiKeyAdapter(id -> "random_key");
+            final ImageryInfo imageryInfo = new ImageryInfo("localhost", wireMockServer.url("/wms?apikey={apikey}"),
+                    "wms_endpoint", null, null);
+            imageryInfo.setId("testActionPerformedEnabledWms");
+            new AddImageryLayerAction(imageryInfo).actionPerformed(null);
+            List<WMSLayer> wmsLayers = MainApplication.getLayerManager().getLayersOfType(WMSLayer.class);
+            assertEquals(1, wmsLayers.size());
 
-        MainApplication.getLayerManager().removeLayer(wmsLayers.get(0));
+            MainApplication.getLayerManager().removeLayer(wmsLayers.get(0));
+        } finally {
+            FeatureAdapter.registerApiKeyAdapter(new FeatureAdapter.DefaultApiKeyAdapter());
+        }
     }