Changeset 18526 in josm for trunk

Timestamp:

2022-07-26T22:44:59+02:00 (2 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 '/').

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/mapmode/SelectActionTest.java (modified) (4 diffs)
• data/imagery/WMTSTileSourceTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

@@ -27 +27 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.ReflectionUtils;
 
@@ -98 +99 @@
 
             MouseEvent event;
+            final int ctrlMask = PlatformManager.getPlatform().getMenuShortcutKeyMaskEx();
             event = new MouseEvent(map,
                                    MouseEvent.MOUSE_PRESSED,
                                    0,
-                                   InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
+                                   InputEvent.BUTTON1_DOWN_MASK | ctrlMask,
                                    100, 0,
                                    1,
@@ -109 +111 @@
                                    MouseEvent.MOUSE_DRAGGED,
                                    1000,
-                                   InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
+                                   InputEvent.BUTTON1_DOWN_MASK | ctrlMask,
                                    50, 0,
                                    1,
@@ -117 +119 @@
                                    MouseEvent.MOUSE_RELEASED,
                                    2000,
-                                   InputEvent.BUTTON1_DOWN_MASK | InputEvent.CTRL_DOWN_MASK,
+                                   InputEvent.BUTTON1_DOWN_MASK | ctrlMask,
                                    5, 0,
                                    1,

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");