Changeset 19053 in josm for trunk

Timestamp:

2024-04-22T21:53:19+02:00 (7 months ago)

Author:

taylor.smock

Message:

See r19043: Drop COMPAT locale provider

Update a test that expected a specific locale provider order. This also removes
a Java >= 9 version check, since that is now always true.

File:

• trunk/test/unit/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProviderTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.IOException;
@@ -23 +23 @@
     @BeforeAll
     static void beforeAll() throws IOException {
-        if (Utils.getJavaVersion() >= 9) {
-            assertEquals("SPI,JRE,CLDR", System.getProperty("java.locale.providers"),
-                    "This test must be launched with -Djava.locale.providers=SPI,JRE,CLDR");
-            try (InputStream in = I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider")) {
-                assertEquals("org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider",
-                        new String(Utils.readBytesFromStream(in), StandardCharsets.UTF_8).trim());
-            }
+        assertEquals("SPI,CLDR", System.getProperty("java.locale.providers"),
+                "This test must be launched with -Djava.locale.providers=SPI,CLDR");
+        try (InputStream in = I18n.class.getResourceAsStream("/META-INF/services/java.text.spi.DecimalFormatSymbolsProvider")) {
+            assertNotNull(in);
+            assertEquals("org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider",
+                    new String(in.readAllBytes(), StandardCharsets.UTF_8).trim());
         }
     }
@@ -36 +35 @@
     void testGroupingSeparator() {
         System.out.println(Locale.getDefault());
-        assumeTrue(Utils.getJavaVersion() >= 9);
 
         assertTrue(I18n.getAvailableTranslations().count() > 10);