Changeset 17967 in josm

Timestamp:

2021-07-09T01:09:04+02:00 (4 years ago)

Author:

Don-vip

Message:

see #19888 - make sure java.locale.providers is set early to SPI,JRE,CLDR for unit tests with Java >= 9 (before JUnit itself initializes Java locales)

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/JosmDecimalFormatSymbolsProviderTest.java (modified) (2 diffs)

trunk/build.xml

@@ -402 +402 @@
                             <jvmarg value="${jacocoagent@{testfamily}@{testITsuffix}}" if:set="jacocoagent@{testfamily}@{testITsuffix}" />
                             <jvmarg value="-Dfile.encoding=UTF-8"/>
+                            <jvmarg value="-Djava.locale.providers=SPI,JRE,CLDR" if:set="isJava9" />
                             <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
                             <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>

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

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.util.Locale;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27 +31 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
+
+    @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());
+            }
+        }
+    }
 
     @Test