test fixes

naotoj · Nov 15, 2023 · d51bb19 · d51bb19
1 parent f6ae1d8
commit d51bb19
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 233 deletions.
diff --git a/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
@@ -52,9 +52,9 @@ public LocaleProviderAdapter.Type getAdapterType() {
     protected Set<String> createLanguageTagSet(String category) {
         return switch (category) {
             case "BreakIteratorInfo", "BreakIteratorRules", "CollationData" -> {
-                // ensure to include en-US
+                // ensure to include en-US/en/ROOT
                 var s = new HashSet<>(super.createLanguageTagSet(category));
-                s.add("en-US");
+                s.addAll(Set.of("en-US", "en", "und"));
                 yield Collections.unmodifiableSet(s);
             }
             case "FormatData" -> Set.of("ja", "und");

diff --git a/test/jdk/java/util/Locale/ExpectedAdapterTypes.java b/test/jdk/java/util/Locale/ExpectedAdapterTypes.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8008577 8138613
+ * @bug 8008577 8138613 8174269
  * @summary Check whether CLDR locale provider adapter is enabled by default
  * @compile -XDignore.symbol.file ExpectedAdapterTypes.java
  * @modules java.base/sun.util.locale.provider
@@ -42,7 +42,7 @@ public class ExpectedAdapterTypes {
 
     static final LocaleProviderAdapter.Type[] expected = {
         LocaleProviderAdapter.Type.CLDR,
-        LocaleProviderAdapter.Type.JRE,
+        LocaleProviderAdapter.Type.FALLBACK,
     };
 
     /**

diff --git a/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java b/test/jdk/java/util/Locale/RequiredAvailableLocalesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -22,10 +22,9 @@
  */
 /**
  * @test
- * @bug 8276186
+ * @bug 8276186 8174269
  * @summary Checks whether getAvailableLocales() returns at least Locale.ROOT and
  *      Locale.US instances.
- * @run testng/othervm -Djava.locale.providers=COMPAT RequiredAvailableLocalesTest
  * @run testng/othervm -Djava.locale.providers=CLDR RequiredAvailableLocalesTest
  */
 

diff --git a/test/jdk/sun/util/locale/provider/Bug8038436.java b/test/jdk/sun/util/locale/provider/Bug8038436.java
diff --git a/test/jdk/sun/util/locale/provider/Bug8163350.java b/test/jdk/sun/util/locale/provider/Bug8163350.java
diff --git a/test/jdk/sun/util/resources/Locale/Bug4429024.java b/test/jdk/sun/util/resources/Locale/Bug4429024.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, 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
@@ -24,8 +24,8 @@
  * @test
  * @summary checking localised language/country names in finnish
  * @modules jdk.localedata
- * @bug 4429024 4964035 6558856 8008577 8287868
- * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4429024
+ * @bug 4429024 4964035 6558856 8008577 8287868 8174269
+ * @run main Bug4429024
  */
 
 import java.util.Locale;

diff --git a/test/jdk/sun/util/resources/Locale/Bug4965260.java b/test/jdk/sun/util/resources/Locale/Bug4965260.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, 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
@@ -22,10 +22,10 @@
  */
 /*
  * @test
- * @bug 4965260 8008577 8287868
+ * @bug 4965260 8008577 8287868 8174269
  * @modules jdk.localedata
  * @summary Verifies the language name of "nl" for supported locales
- * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4965260
+ * @run main Bug4965260
  */
 
 import java.util.Locale;

diff --git a/test/jdk/sun/util/resources/Locale/Bug6275682.java b/test/jdk/sun/util/resources/Locale/Bug6275682.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, 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
@@ -25,7 +25,7 @@
  * @test
  * @summary Verifying that the language names starts with lowercase in spanish
  * @modules jdk.localedata
- * @bug 6275682
+ * @bug 6275682 8174269
 */
 
 import java.util.Locale;
@@ -38,6 +38,10 @@ public static void main (String[] args) throws Exception {
         String error = "";
 
         for (int i = 0; i < isoLangs.length; i++) {
+            // CLDR does not seem to have "bh" and "mo" language name in Spanish
+            if (isoLangs[i].equals("bh") || isoLangs[i].equals("mo")) {
+                continue;
+            }
             Locale current = new Locale (isoLangs[i]);
             String localeString = current.getDisplayLanguage (es);
             String startLetter = localeString.substring (0,1);