Changeset 18958 in josm

Timestamp:

2024-01-25T20:00:41+01:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23418: Improve unit test consistency when run with non-English locales

This also fixes some tests that fail when run individually.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/validation/tests/TagCheckerTest.java (modified) (2 diffs)
• gui/layer/markerlayer/MarkerLayerTest.java (modified) (2 diffs)
• gui/tagging/presets/PresetClassificationsTest.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresetReaderTest.java (modified) (2 diffs)
• testutils/annotations/I18n.java (modified) (2 diffs)
• testutils/annotations/TaggingPresets.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.testutils.annotations.I18n;
 import org.openstreetmap.josm.testutils.annotations.TaggingPresets;
 
@@ -25 +26 @@
  * JUnit Test of {@link TagChecker}.
  */
+@I18n
 @TaggingPresets
 class TagCheckerTest {

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.I18n;
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
@@ -33 +34 @@
 @Main
 @Projection
+@I18n
 class MarkerLayerTest {
     /**

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/PresetClassificationsTest.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector.PresetClassification;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector.PresetClassifications;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.xml.sax.SAXException;
 
@@ -25 +26 @@
  * Unit tests of {@link PresetClassifications} class.
  */
+@Territories
 class PresetClassificationsTest {
 

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Check;
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.xml.sax.SAXException;
 
@@ -77 +78 @@
      * @throws IOException if any I/O error occurs
      */
+    @Territories
     @Test
     void testReadDefaultPresets() throws SAXException, IOException {

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java

@@ -46 +46 @@
             if (!Locale.getDefault().equals(LanguageInfo.getLocale(language, false))) {
                 org.openstreetmap.josm.tools.I18n.set(language);
+                // We want to have a consistent "country", so we don't use a locale with a country code from the original locale.
+                // Unless someone specified it via the <lang>_<country> syntax.
+                if (!language.contains("_")) {
+                    Locale.setDefault(LanguageInfo.getLocale(language, false));
+                }
             }
         }
@@ -51 +56 @@
         @Override
         public void afterEach(ExtensionContext context) {
-            if (!Locale.ENGLISH.equals(Locale.getDefault())) {
+            Locale original = org.openstreetmap.josm.tools.I18n.getOriginalLocale();
+            if (original == null) {
                 org.openstreetmap.josm.tools.I18n.set("en");
-                org.openstreetmap.josm.tools.I18n.set(org.openstreetmap.josm.tools.I18n.getOriginalLocale().getLanguage());
-                Locale.setDefault(Locale.ENGLISH);
+            } else if (!original.equals(Locale.getDefault())) {
+                org.openstreetmap.josm.tools.I18n.set(original.getLanguage());
+                Locale.setDefault(original);
             }
         }

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/TaggingPresets.java

@@ -8 +8 @@
 import java.lang.annotation.Target;
 import java.util.Collection;
+import java.util.Locale;
+import java.util.Objects;
 
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -32 +34 @@
     class TaggingPresetsExtension implements BeforeEachCallback, BeforeAllCallback {
         private static int expectedHashcode = 0;
+        private static Locale lastLocale;
 
         @Override
@@ -48 +51 @@
         public static synchronized void setup() {
             final Collection<TaggingPreset> oldPresets = org.openstreetmap.josm.gui.tagging.presets.TaggingPresets.getTaggingPresets();
-            if (oldPresets.isEmpty() || expectedHashcode != oldPresets.hashCode()) {
+            if (oldPresets.isEmpty() || expectedHashcode != oldPresets.hashCode() || !Objects.equals(lastLocale, Locale.getDefault())) {
                 org.openstreetmap.josm.gui.tagging.presets.TaggingPresets.readFromPreferences();
                 expectedHashcode = org.openstreetmap.josm.gui.tagging.presets.TaggingPresets.getTaggingPresets().hashCode();
+                lastLocale = Locale.getDefault();
             }
         }