Changeset 19054 in josm

Timestamp:

2024-04-23T16:13:30+02:00 (2 weeks ago)

Author:

taylor.smock

Message:

See r19043: Drop COMPAT locale provider

The CLDR provider does not currently return the CET for GMT+01:00. Using only SPI
will result in the "correct" CET timezone abbreviation. If using both, CLDR wins
and returns GMT+01:00. In addition, there are locales that do not use the Western
Arabic numeral system. Specifically, Arabic uses the Eastern Arabic numeral
system, Persian uses the Urdu numeral system, and Marathi uses the Devanagari
numeral system. Of note, while the first character for the Eastern Arabic and
Urdu numeral systems looks the same, it is a different character.

Location:

trunk/test/unit/org/openstreetmap/josm/tools

Files:

• JosmDecimalFormatSymbolsProviderTest.java (modified) (3 diffs)
• date/DateUtilsTest.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
@@ -15 +16 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
@@ -32 +35 @@
     }
 
-    @Test
-    void testGroupingSeparator() {
+    static Stream<Locale> testGroupingSeparator() {
         System.out.println(Locale.getDefault());
 
         assertTrue(I18n.getAvailableTranslations().count() > 10);
-        I18n.getAvailableTranslations().forEach(this::checkGroupingSymbol);
-        Stream.of("", "AU", "IE", "US", "UK").map(country -> new Locale("en", country, "")).forEach(this::checkGroupingSymbol);
-        Stream.of("", "AT", "CH", "DE").map(country -> new Locale("de", country, "")).forEach(this::checkGroupingSymbol);
+        return Stream.concat(
+                I18n.getAvailableTranslations(),
+                Stream.concat(Stream.of("", "AU", "IE", "US", "UK").map(country -> new Locale("en", country, "")),
+                        Stream.of("", "AT", "CH", "DE").map(country -> new Locale("de", country, ""))
+                ));
     }
 
-    private void checkGroupingSymbol(Locale locale) {
-        assertEquals("123\u202F456", DecimalFormat.getInstance(locale).format(123_456), locale.toString());
+    @ParameterizedTest
+    @MethodSource
+    void testGroupingSeparator(Locale locale) {
+        final String formattedNumber = DecimalFormat.getInstance(locale).format(123_456);
+        // Note: If you have to add another numeral system, please indicate the name and the locale(s) it is for.
+        if (formattedNumber.startsWith("1")) {
+            // Western Arabic (for most locales)
+            assertEquals("123\u202F456", formattedNumber, locale.toString() + ": " + locale.getDisplayName());
+        } else if (formattedNumber.startsWith("١")) {
+            // Eastern Arabic (for Arabic locale)
+            assertEquals("١٢٣\u202F٤٥٦", formattedNumber, locale.toString() + ": " + locale.getDisplayName());
+        } else if (formattedNumber.startsWith("۱")) {
+            // Urdu (for Persian locale)
+            assertEquals("۱۲۳\u202F۴۵۶", formattedNumber, locale.toString() + ": " + locale.getDisplayName());
+        } else if (formattedNumber.startsWith("१")) {
+            // Devanagari (for Marathi locale)
+            assertEquals("१२३\u202F४५६", formattedNumber, locale.toString() + ": " + locale.getDisplayName());
+        } else {
+            fail(locale.toString() + " (" + locale.getDisplayName() + "): " + formattedNumber);
+        }
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -160 +160 @@
 
         setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
-        assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(0), DateFormat.LONG));
+        assertEquals("1:00:00 AM GMT+01:00", DateUtils.formatTime(new Date(0), DateFormat.LONG), "This is mostly dependent upon java.locale.providers. CET is also OK.");
     }
 
@@ -308 +308 @@
         }
     }
+
+    /**
+     * Some Java version use narrow no-break space ("NNBSP") instead of a space.
+     * @param time The time string with NNBSP instead of a space
+     * @return The time with spaces instead of NNBSP
+     */
+    private static String replaceWhitespace(String time) {
+        return time.replace((char) 8239 /* "NNBSP" */, ' ');
+    }
 }