Changeset 18372 in josm for trunk/test/unit/org

Timestamp:

2022-02-09T17:45:20+01:00 (2 years ago)

Author:

taylor.smock

Message:

see #21850: WMS and WMTS don't support {apikey}

Add tests for r18371.

Location:

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

Files:

• TemplatedWMSTileSourceTest.java (modified) (2 diffs)
• WMTSTileSourceTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
@@ -201 +204 @@
     }
 
+    @Test
+    void testApiKeyValid() {
+        try {
+            Projection projection = Projections.getProjectionByCode("EPSG:4326");
+            ProjectionRegistry.setProjection(projection);
+            FeatureAdapter.registerApiKeyAdapter(id -> "test_api_key");
+            ImageryInfo testImageryWMS = new ImageryInfo("test imagery",
+                    "https://maps.six.nsw.gov.au/arcgis/services/{apikey}/NSW_Imagery_Dates/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&"
+                            + "REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=0&STYLES=&FORMAT=image/png32&DPI=96&"
+                            + "MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE", "wms", null, null);
+            testImageryWMS.setId("TemplatedWMSTileSourceTest#testApiKeyValid");
+            TemplatedWMSTileSource ts = new TemplatedWMSTileSource(testImageryWMS, projection);
+            assertEquals("https://maps.six.nsw.gov.au/arcgis/services/test_api_key/NSW_Imagery_Dates/MapServer/WMSServer?SERVICE=WMS&"
+                            + "VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=-1350.0000000,540.0000000,-990.0000000,900.0000000&WIDTH=512&"
+                            + "HEIGHT=512&LAYERS=0&STYLES=&FORMAT=image/png32&DPI=96&MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE",
+                    ts.getTileUrl(1, 2, 3));
+        } finally {
+            FeatureAdapter.registerApiKeyAdapter(new FeatureAdapter.DefaultApiKeyAdapter());
+        }
+    }
+
+    @Test
+    void testApiKeyInvalid() {
+        try {
+            FeatureAdapter.registerApiKeyAdapter(id -> null);
+            ImageryInfo testImageryWMS = new ImageryInfo("test imagery",
+                    "https://maps.six.nsw.gov.au/arcgis/services/{apikey}/NSW_Imagery_Dates/MapServer/WMSServer?SERVICE=WMS&VERSION=1.3.0&"
+                            + "REQUEST=GetMap&CRS={proj}&BBOX={bbox}&WIDTH={width}&HEIGHT={height}&LAYERS=0&STYLES=&FORMAT=image/png32&DPI=96&"
+                            + "MAP_RESOLUTION=96&FORMAT_OPTIONS=dpi:96&TRANSPARENT=TRUE", "wms", null, null);
+            testImageryWMS.setId("TemplatedWMSTileSourceTest#testApiKeyInvalid");
+            Projection projection = Projections.getProjectionByCode("EPSG:4326");
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> new TemplatedWMSTileSource(testImageryWMS, projection));
+            assertEquals(tr("Could not retrieve API key for imagery with id={0}. Cannot add layer.", testImageryWMS.getId()),
+                    exception.getMessage());
+        } finally {
+            FeatureAdapter.registerApiKeyAdapter(new FeatureAdapter.DefaultApiKeyAdapter());
+        }
+    }
+
     private void verifyMercatorTile(TemplatedWMSTileSource source, int x, int y, int z) {
         TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS);

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.imagery;
 
+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 static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
@@ -18 +22 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.gui.jmapviewer.FeatureAdapter;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
@@ -439 +444 @@
                 source.getTileUrl(11, tile.getXIndex(), tile.getYIndex()));
     }
+
+    @Test
+    void testApiKeyValid() {
+        assumeFalse(testImagery12168 == null);
+        try {
+            ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326"));
+            FeatureAdapter.registerApiKeyAdapter(id -> TestUtils.getTestDataRoot());
+            ImageryInfo testImageryWMTS = new ImageryInfo(testImagery12168);
+            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot(), "{apikey}"));
+            assertTrue(testImageryWMTS.getUrl().contains("{apikey}"));
+            testImageryWMTS.setId("WMTSTileSourceTest#testApiKeyValid");
+            WMTSTileSource ts = assertDoesNotThrow(() -> new WMTSTileSource(testImageryWMTS, ProjectionRegistry.getProjection()));
+            assertEquals("http://www.ngi.be/cartoweb/1.0.0/topo/default/3812/1/3/2.png",
+                    ts.getTileUrl(1, 2, 3));
+        } finally {
+            FeatureAdapter.registerApiKeyAdapter(new FeatureAdapter.DefaultApiKeyAdapter());
+        }
+    }
+
+    @Test
+    void testApiKeyInvalid() {
+        assumeFalse(testImagery12168 == null);
+        try {
+            ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326"));
+            FeatureAdapter.registerApiKeyAdapter(id -> null);
+            ImageryInfo testImageryWMTS = new ImageryInfo(testImagery12168);
+            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot(), "{apikey}"));
+            assertTrue(testImageryWMTS.getUrl().contains("{apikey}"));
+            testImageryWMTS.setId("TemplatedWMSTileSourceTest#testApiKeyInvalid");
+            org.openstreetmap.josm.data.projection.Projection projection = Projections.getProjectionByCode("EPSG:4326");
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> new WMTSTileSource(testImageryWMTS, projection));
+            assertEquals(tr("Could not retrieve API key for imagery with id={0}. Cannot add layer.", testImageryWMTS.getId()),
+                    exception.getMessage());
+        } finally {
+            FeatureAdapter.registerApiKeyAdapter(new FeatureAdapter.DefaultApiKeyAdapter());
+        }
+    }
 }