Changeset 18526 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2022-07-26T22:44:59+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix tests that have been broken on Mac and Windows

Mac was due to ctrl -> cmd differences, Windows was
path issues ('\' versus '/').

File:

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

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

@@ -450 +450 @@
         try {
             ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326"));
-            FeatureAdapter.registerApiKeyAdapter(id -> TestUtils.getTestDataRoot());
+            FeatureAdapter.registerApiKeyAdapter(id -> TestUtils.getTestDataRoot().replace('\\', '/'));
             ImageryInfo testImageryWMTS = new ImageryInfo(testImagery12168);
-            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot(), "{apikey}"));
+            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot().replace('\\', '/'), "{apikey}"));
             assertTrue(testImageryWMTS.getUrl().contains("{apikey}"), testImageryWMTS.getUrl());
             testImageryWMTS.setId("WMTSTileSourceTest#testApiKeyValid");
@@ -470 +470 @@
             FeatureAdapter.registerApiKeyAdapter(id -> null);
             ImageryInfo testImageryWMTS = new ImageryInfo(testImagery12168);
-            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot(), "{apikey}"));
+            testImageryWMTS.setUrl(testImageryWMTS.getUrl().replace(TestUtils.getTestDataRoot().replace('\\', '/'), "{apikey}"));
             assertTrue(testImageryWMTS.getUrl().contains("{apikey}"), testImageryWMTS.getUrl());
             testImageryWMTS.setId("WMTSTileSourceTest#testApiKeyInvalid");