8310234: Refactor Locale tests to use JUnit

Reviewed-by: rschmelter
Backport-of: dad7bd9efc7ca2c245f7e35267479670f93a53a8

Author: GoeLin

test/jdk/java/util/Locale/Bug4316602.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,30 +20,43 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
-    @test
-    @summary Locale variant should not be uppercased
-    @run main Bug4210525
-    @bug 4210525
-*/
+
+/*
+ * @test
+ * @bug 4210525
+ * @summary Locale variant should not be case folded
+ * @run junit CaseCheckVariant
+ */
 
 import java.util.Locale;
+import java.util.stream.Stream;
 
-public class Bug4210525 {
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-    public static void main(String[] args) throws Exception {
-        String language = "en";
-        String country = "US";
-        String variant = "socal";
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-        Locale aLocale = new Locale(language, country, variant);
+public class CaseCheckVariant {
 
+    static final String LANG = "en";
+    static final String COUNTRY = "US";
+
+    /**
+     * When a locale is created with a given variant, ensure
+     * that the variant is not case normalized.
+     */
+    @ParameterizedTest
+    @MethodSource("variants")
+    public void variantCaseTest(String variant) {
+        Locale aLocale = new Locale(LANG, COUNTRY, variant);
         String localeVariant = aLocale.getVariant();
-        if (localeVariant.equals(variant)) {
-            System.out.println("passed");
-        } else {
-            System.out.println("failed");
-            throw new Exception("Bug4210525 test failed.");
-        }
+        assertEquals(localeVariant, variant);
+    }
+
+    private static Stream<String> variants() {
+        return Stream.of(
+                "socal",
+                "Norcal"
+        );
     }
 }

test/jdk/java/util/Locale/Bug4210525.java …k/java/util/Locale/CaseCheckVariant.javatest/jdk/java/util/Locale/Bug4210525.java renamed to test/jdk/java/util/Locale/CaseCheckVariant.java test/jdk/java/util/Locale/Bug4210525.java renamed to test/jdk/java/util/Locale/CaseCheckVariant.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,43 +28,65 @@
  *          java.base/sun.util.resources
  *          jdk.localedata
  * @summary Test for checking HourFormat and GmtFormat resources are retrieved from
- *  COMPAT and CLDR Providers.
+ * COMPAT and CLDR Providers.
+ * @run junit CompareProviderFormats
 */
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.stream.Stream;
+
 import sun.util.locale.provider.LocaleProviderAdapter.Type;
 import sun.util.locale.provider.LocaleProviderAdapter;
 
-public class Bug8154797 {
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class CompareProviderFormats {
     static Map<String, String> expectedResourcesMap = new HashMap<>();
     static final String GMT_RESOURCE_KEY = "timezone.gmtFormat";
     static final String HMT_RESOURCE_KEY = "timezone.hourFormat";
     static final String GMT = "Gmt";
     static final String HMT = "Hmt";
 
-    static void generateExpectedValues() {
+    /**
+     * Fill the expectedResourcesMap with the desired key / values
+     */
+    @BeforeAll
+    static void populateResourcesMap() {
         expectedResourcesMap.put("FR" + GMT, "UTC{0}");
         expectedResourcesMap.put("FR" + HMT, "+HH:mm;\u2212HH:mm");
         expectedResourcesMap.put("FI" + HMT, "+H.mm;-H.mm");
         expectedResourcesMap.put("FI" + GMT, "UTC{0}");
-        /* For  root locale, en_US, de_DE, hi_IN, ja_JP,Root locale resources
-        * should be returned.
+        /* For root locale, en_US, de_DE, hi_IN, ja_JP, Root locale resources
+         * should be returned.
          */
-        expectedResourcesMap.put(GMT, "GMT{0}"); //Root locale resource
-        expectedResourcesMap.put(HMT, "+HH:mm;-HH:mm"); //Root locale resource
+        expectedResourcesMap.put(GMT, "GMT{0}"); // Root locale resource
+        expectedResourcesMap.put(HMT, "+HH:mm;-HH:mm"); // Root locale resource
+    }
+
+    /**
+     * For each locale, ensure that the returned resources for gmt and hmt match
+     * the expected resources for both COMPAT and CLDR
+     */
+    @ParameterizedTest
+    @MethodSource("localeProvider")
+    public void compareResourcesTest(Locale loc) {
+        compareResources(loc);
     }
 
-    static void compareResources(Locale loc) {
+    private void compareResources(Locale loc) {
         String mapKeyHourFormat = HMT, mapKeyGmtFormat = GMT;
         ResourceBundle compatBundle, cldrBundle;
         compatBundle = LocaleProviderAdapter.forJRE().getLocaleResources(loc)
                 .getJavaTimeFormatData();
         cldrBundle = LocaleProviderAdapter.forType(Type.CLDR)
                 .getLocaleResources(loc).getJavaTimeFormatData();
-        if (loc.getCountry() == "FR" || loc.getCountry() == "FI") {
+
+        if (loc.getCountry().equals("FR") || loc.getCountry().equals("FI")) {
             mapKeyHourFormat = loc.getCountry() + HMT;
             mapKeyGmtFormat = loc.getCountry() + GMT;
         }
@@ -77,23 +99,17 @@ static void compareResources(Locale loc) {
                 .equals(cldrBundle.getString(GMT_RESOURCE_KEY))
                 && expectedResourcesMap.get(mapKeyHourFormat)
                 .equals(cldrBundle.getString(HMT_RESOURCE_KEY)))) {
-
             throw new RuntimeException("Retrieved resource does not match with "
                     + "  expected string for Locale " + compatBundle.getLocale());
-
         }
-
     }
 
-    public static void main(String args[]) {
-        Bug8154797.generateExpectedValues();
-        Locale[] locArr = {new Locale("hi", "IN"), Locale.UK, new Locale("fi", "FI"),
-                           Locale.ROOT, Locale.GERMAN, Locale.JAPANESE,
-                           Locale.ENGLISH, Locale.FRANCE};
-        for (Locale loc : locArr) {
-            Bug8154797.compareResources(loc);
-        }
+    private static Stream<Locale> localeProvider() {
+        return Stream.of(
+                new Locale("hi", "IN"),
+                Locale.UK, new Locale("fi", "FI"),
+                Locale.ROOT, Locale.GERMAN, Locale.JAPANESE,
+                Locale.ENGLISH, Locale.FRANCE
+        );
     }
-
 }
-

test/jdk/java/util/Locale/Bug8154797.java …/util/Locale/CompareProviderFormats.javatest/jdk/java/util/Locale/Bug8154797.java renamed to test/jdk/java/util/Locale/CompareProviderFormats.java test/jdk/java/util/Locale/Bug8154797.java renamed to test/jdk/java/util/Locale/CompareProviderFormats.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,25 +26,27 @@
  * @bug 8004240
  * @summary Verify that getAdapterPreference returns an unmodifiable list.
  * @modules java.base/sun.util.locale.provider
- * @compile -XDignore.symbol.file Bug8004240.java
- * @run main Bug8004240
+ * @compile -XDignore.symbol.file GetAdapterPreference.java
+ * @run junit GetAdapterPreference
  */
 
 import java.util.List;
 import sun.util.locale.provider.LocaleProviderAdapter;
 
-public class Bug8004240 {
+import org.junit.jupiter.api.Test;
 
-    public static void main(String[] args) {
-        List<LocaleProviderAdapter.Type> types = LocaleProviderAdapter.getAdapterPreference();
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-        try {
-            types.set(0, null);
-        } catch (UnsupportedOperationException e) {
-            // success
-            return;
-        }
+public class GetAdapterPreference {
 
-        throw new RuntimeException("LocaleProviderAdapter.getAdapterPrefence() returned a modifiable list.");
+    /**
+     * Test that the list returned from getAdapterPreference()
+     * cannot be modified.
+     */
+    @Test
+    public void immutableTest() {
+        List<LocaleProviderAdapter.Type> types = LocaleProviderAdapter.getAdapterPreference();
+        assertThrows(UnsupportedOperationException.class, () -> types.set(0, null),
+                "Trying to modify list returned from LocaleProviderAdapter.getAdapterPreference() did not throw UOE");
     }
 }