Changeset 14288 in josm for trunk

Timestamp:

2018-10-01T22:48:36+02:00 (6 years ago)

Author:

Don-vip

Message:

fix unit test / checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1568 +1568 @@
                          *  See: #14562
                          */
-                            ts2.loadAllTiles(false);
+                        ts2.loadAllTiles(false);
                     }
                 }

trunk/test/unit/org/openstreetmap/josm/tools/KeyboardUtilsTest.java

@@ -91 +91 @@
         testgetCharactersForKeyE00("tr", '"', '*', '`', deadGrave, deadGrave2);
         testgetCharactersForKeyE00("de_LU", deadCircumflex, deadCircumflex2, '²', '§', '`', deadGrave, deadGrave2);
-        testgetCharactersForKeyE00("fr_LU", '$', '²', '§', '`', deadGrave, deadGrave2);
-        testgetCharactersForKeyE00("fr_CH", '²', '$', '§', '`', deadGrave, deadGrave2);
+        if (PlatformManager.isPlatformUnixoid()) {
+            testgetCharactersForKeyE00("fr_LU", '$', 'œ', '²', '§', '`', deadGrave, deadGrave2);
+            testgetCharactersForKeyE00("fr_CH", 'œ', '²', '$', '§', '`', deadGrave, deadGrave2);
+        } else {
+            testgetCharactersForKeyE00("fr_LU", '$', '²', '§', '`', deadGrave, deadGrave2);
+            testgetCharactersForKeyE00("fr_CH", '²', '$', '§', '`', deadGrave, deadGrave2);
+        }
         testgetCharactersForKeyE00("de_CH", deadCircumflex, deadCircumflex2, '§', '`', deadGrave, deadGrave2);
         testgetCharactersForKeyE00("de_LI", deadCircumflex, deadCircumflex2, '§', '`', deadGrave, deadGrave2);