From f8a83c729268a994c79f7c7183bf6944b26203b1 Mon Sep 17 00:00:00 2001
From: Andrew Lu <andrewlu@openjdk.org>
Date: Mon, 6 May 2024 07:41:05 +0000
Subject: [PATCH 1/5] 8295343: sun/security/pkcs11 tests fail on Linux RHEL 8.6
 and newer 8231351: Add notes for PKCS11 tests in the test doc

Reviewed-by: lucy
Backport-of: 6ce0ebb858d3112f136e12d3ad595f805f6871a0
---
 doc/testing.html                              |  20 ++--
 doc/testing.md                                |  16 +++
 test/jdk/ProblemList.txt                      |   7 +-
 test/jdk/sun/security/pkcs11/PKCS11Test.java  | 101 ++----------------
 test/jdk/sun/security/pkcs11/README           |  13 +--
 .../sun/security/tools/keytool/NssTest.java   |   9 +-
 .../sun/security/tools/keytool/p11-nss.txt    |   2 +-
 7 files changed, 52 insertions(+), 116 deletions(-)

diff --git a/doc/testing.html b/doc/testing.html
index 18ba3e2baf6..c3e8ca956b0 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -5,7 +5,7 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Testing the JDK</title>
-  <style type="text/css">
+  <style>
       code{white-space: pre-wrap;}
       span.smallcaps{font-variant: small-caps;}
       span.underline{text-decoration: underline;}
@@ -21,7 +21,7 @@
 <header id="title-block-header">
 <h1 class="title">Testing the JDK</h1>
 </header>
-<nav id="TOC">
+<nav id="TOC" role="doc-toc">
 <ul>
 <li><a href="#using-the-run-test-framework">Using the run-test framework</a><ul>
 <li><a href="#configuration">Configuration</a></li>
@@ -40,6 +40,7 @@ <h1 class="title">Testing the JDK</h1>
 <li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
 <li><a href="#docker-tests">Docker Tests</a></li>
 <li><a href="#client-ui-tests">Client UI Tests</a></li>
+<li><a href="#pkcs11-tests">PKCS11 Tests</a></li>
 </ul></li>
 </ul>
 </nav>
@@ -58,7 +59,7 @@ <h3 id="configuration">Configuration</h3>
 <p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
 <h2 id="test-selection">Test selection</h2>
 <p>All functionality is available using the run-test make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, run-test-only can be used instead, which do not depend on the source and test image build.</p>
-<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
+<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST="tier1"</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST="x"</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="common-test-groups">Common Test Groups</h3>
 <p>Ideally, all tests are run for every change but this may not be practical due to the limited testing resources, the scope of the change, etc.</p>
@@ -101,8 +102,8 @@ <h2 id="test-results-and-summary">Test results and summary</h2>
 <p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p>
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
-<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG="JOBS=1;TIMEOUT=8"</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG="TMIEOUT=8"</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG="...;..."</code>. This will also make sure spaces are preserved, as in <code>JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"</code>.</p>
 <p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
@@ -152,7 +153,7 @@ <h4 id="run_problem_lists">RUN_PROBLEM_LISTS</h4>
 <p>Set to <code>true</code> or <code>false</code>. If <code>true</code>, JTReg will use <code>-match:</code> option, otherwise <code>-exclude:</code> will be used. Default is <code>false</code>.</p>
 <h4 id="options">OPTIONS</h4>
 <p>Additional options to the JTReg test framework.</p>
-<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
+<p>Use <code>JTREG="OPTIONS=--help all"</code> to see all available JTReg options.</p>
 <h4 id="java_options-1">JAVA_OPTIONS</h4>
 <p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
@@ -169,7 +170,7 @@ <h4 id="repeat">REPEAT</h4>
 <p>Default is 1. Set to -1 to repeat indefinitely. This can be especially useful combined with <code>OPTIONS=--gtest_break_on_failure</code> to reproduce an intermittent problem.</p>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
-<p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
+<p>Use <code>GTEST="OPTIONS=--help"</code> to see all available Gtest options.</p>
 <h4 id="aot_modules-2">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
@@ -178,6 +179,11 @@ <h3 id="docker-tests">Docker Tests</h3>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
 <p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
+<h3 id="pkcs11-tests">PKCS11 Tests</h3>
+<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories.The<code>&lt;NAME&gt;</code> component should be replaced with the name element of the appropriate <code>@Artifact</code> class. (See<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
+<p>For example:</p>
+<pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot</code></pre>
+<p>For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
 <p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>
 <h4 id="macos">MacOS</h4>
diff --git a/doc/testing.md b/doc/testing.md
index fc0d436a2a1..26a3d78ff8b 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -370,6 +370,22 @@ required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
 
     $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
 
+### PKCS11 Tests
+
+It is highly recommended to use the latest NSS version when running PKCS11 tests.
+Improper NSS version may lead to unexpected failures which are hard to diagnose.
+For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu
+18.04 with the default NSS version in the system.
+To run these tests correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
+Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
+component should be replaced with the name element of the appropriate
+`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
+For example:
+
+    $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
+
+For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.
+
 ### Client UI Tests
 
 Some Client UI tests use key sequences which may be reserved by the operating
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 01d06a00cb5..9d7fa261bb2 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -634,12 +634,7 @@ sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 gene
 sun/security/provider/PolicyParser/ExtDirsChange.java           8039280 generic-all
 sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
 
-sun/security/tools/keytool/NssTest.java                         8295343,8204203 linux-all,windows-all
-sun/security/pkcs11/Signature/TestRSAKeyLength.java             8295343 linux-all
-sun/security/pkcs11/rsa/TestSignatures.java                     8295343 linux-all
-sun/security/pkcs11/rsa/TestKeyPairGenerator.java               8295343 linux-all
-sun/security/pkcs11/rsa/TestKeyFactory.java                     8295343 linux-all
-sun/security/pkcs11/KeyStore/Basic.java                         8295343 linux-all
+sun/security/tools/keytool/NssTest.java                         8204203 linux-all,windows-all
 
 ############################################################################
 
diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index a539c879b03..1c0c8d6dcad 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -48,7 +48,6 @@
 import java.security.spec.ECParameterSpec;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -384,30 +383,19 @@ private static Path getNSSLibPath() throws Exception {
 
     static Path getNSSLibPath(String library) throws Exception {
         String osid = getOsId();
-        String[] nssLibDirs = getNssLibPaths(osid);
-        if (nssLibDirs == null) {
-            System.out.println("Warning: unsupported OS: " + osid
+        String nssLibDir = fetchNssLib(osid);
+        if (nssLibDir == null) {
+            throw new SkippedException("Warning: unsupported OS: " + osid
                     + ", please initialize NSS library location, skipping test");
-            return null;
-        }
-        if (nssLibDirs.length == 0) {
-            System.out.println("Warning: NSS not supported on this platform, skipping test");
-            return null;
         }
 
-        Path nssLibPath = null;
-        for (String dir : nssLibDirs) {
-            Path libPath = Paths.get(dir).resolve(System.mapLibraryName(library));
-            if (Files.exists(libPath)) {
-                nssLibPath = libPath;
-                break;
-            }
-        }
-        if (nssLibPath == null) {
-            System.out.println("Warning: can't find NSS library on this machine, skipping test");
-            return null;
+        String libraryName = System.mapLibraryName(library);
+        Path libPath = Paths.get(nssLibDir).resolve(libraryName);
+        if (!Files.exists(libPath)) {
+            throw new SkippedException("NSS library \"" + libraryName + "\" was not found in " + nssLibDir);
         }
-        return nssLibPath;
+
+        return libPath;
     }
 
     private static String getOsId() {
@@ -731,77 +719,6 @@ private static ECParameterSpec getECParameterSpec(Provider p, String name)
         return parameters.getParameterSpec(ECParameterSpec.class);
     }
 
-    // Location of the NSS libraries on each supported platform
-    private static Map<String, String[]> getOsMap() {
-        if (osMap != null) {
-            return osMap;
-        }
-
-        osMap = new HashMap<>();
-        osMap.put("SunOS-sparc-32", new String[] { "/usr/lib/mps/" });
-        osMap.put("SunOS-sparcv9-64", new String[] { "/usr/lib/mps/64/" });
-        osMap.put("SunOS-x86-32", new String[] { "/usr/lib/mps/" });
-        osMap.put("SunOS-amd64-64", new String[] { "/usr/lib/mps/64/" });
-        osMap.put("Linux-i386-32", new String[]{
-                "/usr/lib/i386-linux-gnu/",
-                "/usr/lib32/",
-                "/usr/lib/"});
-        osMap.put("Linux-amd64-64", new String[]{
-                "/usr/lib/x86_64-linux-gnu/",
-                "/usr/lib/x86_64-linux-gnu/nss/",
-                "/usr/lib64/"});
-        osMap.put("Linux-ppc64-64", new String[]{"/usr/lib64/"});
-        osMap.put("Linux-ppc64le-64", new String[]{"/usr/lib64/"});
-        osMap.put("Linux-s390x-64", new String[]{"/usr/lib64/"});
-        osMap.put("Windows-x86-32", new String[]{});
-        osMap.put("Windows-amd64-64", new String[]{});
-        osMap.put("MacOSX-x86_64-64", new String[]{});
-        osMap.put("Linux-arm-32", new String[]{
-                "/usr/lib/arm-linux-gnueabi/nss/",
-                "/usr/lib/arm-linux-gnueabihf/nss/"});
-        // Exclude linux-aarch64 at the moment until the following bug is fixed:
-        // 8296631: NSS tests failing on OL9 linux-aarch64 hosts
-//        osMap.put("Linux-aarch64-64", new String[] {
-//                "/usr/lib/aarch64-linux-gnu/",
-//                "/usr/lib/aarch64-linux-gnu/nss/",
-//                "/usr/lib64/" });
-        return osMap;
-    }
-
-    private static String[] getNssLibPaths(String osId) {
-        String[] preferablePaths = getPreferableNssLibPaths(osId);
-        if (preferablePaths.length != 0) {
-            return preferablePaths;
-        } else {
-            return getOsMap().get(osId);
-        }
-    }
-
-    private static String[] getPreferableNssLibPaths(String osId) {
-        List<String> nssLibPaths = new ArrayList<>();
-
-        String customNssLibPaths = System.getProperty("test.nss.lib.paths");
-        if (customNssLibPaths == null) {
-            // If custom local NSS lib path is not provided,
-            // try to download NSS libs from artifactory
-            String path = fetchNssLib(osId);
-            if (path != null) {
-                nssLibPaths.add(path);
-            }
-        } else {
-            String[] paths = customNssLibPaths.split(",");
-            for (String path : paths) {
-                if (!path.endsWith(File.separator)) {
-                    nssLibPaths.add(path + File.separator);
-                } else {
-                    nssLibPaths.add(path);
-                }
-            }
-        }
-
-        return nssLibPaths.toArray(new String[0]);
-    }
-
     private final static char[] hexDigits = "0123456789abcdef".toCharArray();
 
     private static final String distro = distro();
diff --git a/test/jdk/sun/security/pkcs11/README b/test/jdk/sun/security/pkcs11/README
index 31efd034501..9b4c39dd41c 100644
--- a/test/jdk/sun/security/pkcs11/README
+++ b/test/jdk/sun/security/pkcs11/README
@@ -4,14 +4,15 @@ perform as a result of bugs or features in NSS or other pkcs11 libraries.
 - How to get NSS libraries?
 The libraries come from the following sources.
 
-1. Specified by system property test.nss.lib.paths
-System property test.nss.lib.paths can specify a set of absolute paths to
-the local NSS library directories. The paths are separated by comma.
+1. Specified by system property jdk.test.lib.artifacts.<NAME>
+The system property, jdk.test.lib.artifacts.<NAME>, can specify an absolute path
+to the local NSS library directory. The <NAME> component should be replaced with
+the name element of the appropriate @Artifact class.
+(See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
 
 2. Pre-built NSS libraries from artifactory server
-If the value of system property test.nss.lib.paths is not set, the tests will try
-to download pre-built NSS libraries from artifactory server. Currently, the
-tests only looks for libraries for Windows and MacOSX platforms on artifactory.
+If the value of system property jdk.test.lib.artifacts.<NAME> is not set, the
+tests will try to download pre-built NSS libraries from artifactory server.
 Please note that JIB jar MUST be present in classpath when downloading the
 libraries.
 
diff --git a/test/jdk/sun/security/tools/keytool/NssTest.java b/test/jdk/sun/security/tools/keytool/NssTest.java
index bc66fdaae44..80ef41d446d 100644
--- a/test/jdk/sun/security/tools/keytool/NssTest.java
+++ b/test/jdk/sun/security/tools/keytool/NssTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -56,8 +56,9 @@ private static void copyFiles() throws IOException {
 
         Path dbPath = srcPath.getParent().getParent()
                 .resolve("pkcs11").resolve("nss").resolve("db");
-        Files.copy(dbPath.resolve("cert8.db"), Paths.get("cert8.db"));
-        Files.copy(dbPath.resolve("key3.db"), Paths.get("key3.db"));
-        Files.copy(dbPath.resolve("secmod.db"), Paths.get("secmod.db"));
+        Path destDir = Path.of( "tmpdb");
+        Files.createDirectory(destDir);
+        Files.copy(dbPath.resolve("cert9.db"), destDir.resolve("cert9.db"));
+        Files.copy(dbPath.resolve("key4.db"), destDir.resolve("key4.db"));
     }
 }
diff --git a/test/jdk/sun/security/tools/keytool/p11-nss.txt b/test/jdk/sun/security/tools/keytool/p11-nss.txt
index dd200a326c0..9c8ac0a43ab 100644
--- a/test/jdk/sun/security/tools/keytool/p11-nss.txt
+++ b/test/jdk/sun/security/tools/keytool/p11-nss.txt
@@ -6,7 +6,7 @@ slot = 2
 
 library = ${nss.lib}
 
-nssArgs = "configdir='.' certPrefix='' keyPrefix='' secmod='secmod.db'"
+nssArgs = "configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db'"
 
 #forceLogin = true
 

From f8593936d6d54bb1060f54cc67e2bf22f40b8064 Mon Sep 17 00:00:00 2001
From: Andrew Lu <andrewlu@openjdk.org>
Date: Mon, 6 May 2024 07:41:24 +0000
Subject: [PATCH 2/5] 8310818: Refactor more Locale tests to use JUnit

Reviewed-by: lucy
Backport-of: 989e0bfe59d67f6a751e8b187caabbd0fd8c8f81
---
 test/jdk/java/util/Locale/Bug4175998Test.java | 855 ------------------
 test/jdk/java/util/Locale/Bug8025703.java     |  71 --
 test/jdk/java/util/Locale/Bug8032842.java     |  99 --
 ...8008577.java => ExpectedAdapterTypes.java} |  29 +-
 .../Locale/{Bug8071929.java => ISO3166.java}  |  27 +-
 test/jdk/java/util/Locale/ISO639.java         | 295 ++++++
 ...01562.java => JDK7LocaleServiceDiffs.java} |  56 +-
 .../{Bug8026766.java => LRToString.java}      |  39 +-
 .../Locale/LanguageSubtagRegistryTest.java    |  18 +-
 .../jdk/java/util/Locale/PreserveTagCase.java | 114 +++
 10 files changed, 516 insertions(+), 1087 deletions(-)
 delete mode 100644 test/jdk/java/util/Locale/Bug4175998Test.java
 delete mode 100644 test/jdk/java/util/Locale/Bug8025703.java
 delete mode 100644 test/jdk/java/util/Locale/Bug8032842.java
 rename test/jdk/java/util/Locale/{Bug8008577.java => ExpectedAdapterTypes.java} (59%)
 rename test/jdk/java/util/Locale/{Bug8071929.java => ISO3166.java} (93%)
 create mode 100644 test/jdk/java/util/Locale/ISO639.java
 rename test/jdk/java/util/Locale/{Bug8001562.java => JDK7LocaleServiceDiffs.java} (71%)
 rename test/jdk/java/util/Locale/{Bug8026766.java => LRToString.java} (50%)
 create mode 100644 test/jdk/java/util/Locale/PreserveTagCase.java

diff --git a/test/jdk/java/util/Locale/Bug4175998Test.java b/test/jdk/java/util/Locale/Bug4175998Test.java
deleted file mode 100644
index a5ad1dd3abd..00000000000
--- a/test/jdk/java/util/Locale/Bug4175998Test.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
- * Copyright (c) 2007, 2016, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @summary test ISO639-2 language codes
- * @library /java/text/testlib
- * @compile -encoding ascii Bug4175998Test.java
- * @run main Bug4175998Test
- * @bug 4175998
- */
-
-/*
- *
- *
- * (C) Copyright IBM Corp. 1998 - All Rights Reserved
- *
- * The original version of this source code and documentation is
- * copyrighted and owned by IBM. These materials are provided
- * under terms of a License Agreement between IBM and Sun.
- * This technology is protected by multiple US and International
- * patents. This notice and attribution to IBM may not be removed.
- *
- */
-
-import java.util.*;
-
-/**
- *  Bug4175998Test verifies that the following bug has been fixed:
- *  Bug 4175998 - The java.util.Locale.getISO3Language() returns wrong result for a locale with
- *           language code 'ta'(Tamil).
- */
-public class Bug4175998Test extends IntlTest {
-    public static void main(String[] args) throws Exception {
-        new Bug4175998Test().run(args);
-        //generateTables();    //uncomment this to regenerate data tables
-    }
-
-    public void testIt() throws Exception {
-        boolean bad = false;
-        for (int i = 0; i < CODES.length; i++) {
-            final String[] localeCodes = CODES[i];
-            final Locale l = new Locale(localeCodes[0], "");
-            final String iso3 = l.getISO3Language();
-            if (!iso3.equals(localeCodes[1]) /*&& !iso3.equals(localeCodes[2])*/) {
-                logln("Locale("+l+") returned bad ISO3 language code."
-                        +"   Got '"+iso3+"' instead of '"+localeCodes[1]+"'"/*+" or '"+localeCodes[2]+"'"*/);
-                bad = true;
-            }
-        }
-        if (bad) {
-            errln("Bad ISO3 language codes detected.");
-        }
-    }
-
-     private static final String[][] CODES = {
-        {"pt","por","por"},
-        {"eu","eus","baq"},
-        {"ps","pus","pus"},
-        {"et","est","est"},
-        {"ka","kat","geo"},
-        {"es","spa","spa"},
-        {"eo","epo","epo"},
-        {"en","eng","eng"},
-        {"pl","pol","pol"},
-        {"el","ell","gre"},
-        {"uz","uzb","uzb"},
-        {"jv","jav","jav"},
-        {"ur","urd","urd"},
-        {"uk","ukr","ukr"},
-        {"ug","uig","uig"},
-        {"zu","zul","zul"},
-        {"ja","jpn","jpn"},
-        {"or","ori","ori"},
-        {"om","orm","orm"},
-        {"zh","zho","chi"},
-        {"tw","twi","twi"},
-        {"de","deu","ger"},
-        {"oc","oci","oci"},
-        {"za","zha","zha"},
-        {"tt","tat","tat"},
-        {"iu","iku","iku"},
-        {"ts","tso","tso"},
-        {"it","ita","ita"},
-        {"tr","tur","tur"},
-        {"da","dan","dan"},
-        {"is","isl","ice"},
-        {"to","ton","ton"},
-        {"tl","tgl","tgl"},
-        {"tk","tuk","tuk"},
-        {"ik","ipk","ipk"},
-        {"ti","tir","tir"},
-        {"th","tha","tha"},
-        {"tg","tgk","tgk"},
-        {"te","tel","tel"},
-        {"cy","cym","wel"},
-        {"ie","ile","ile"},
-        {"id","ind","ind"},
-        {"ta","tam","tam"},
-        {"ia","ina","ina"},
-        {"cs","ces","cze"},
-        {"yo","yor","yor"},
-        {"no","nor","nor"},
-        {"co","cos","cos"},
-        {"nl","nld","dut"},
-        {"yi","yid","yid"},
-        {"hy","hye","arm"},
-        {"sw","swa","swa"},
-        {"ne","nep","nep"},
-        {"sv","swe","swe"},
-        {"su","sun","sun"},
-        {"hu","hun","hun"},
-        {"na","nau","nau"},
-        {"sr","srp","scc"},
-        {"ca","cat","cat"},
-        {"sq","sqi","alb"},
-        {"hr","hrv","scr"},
-        {"so","som","som"},
-        {"sn","sna","sna"},
-        {"sm","smo","smo"},
-        {"sl","slv","slv"},
-        {"sk","slk","slo"},
-        {"si","sin","sin"},
-        {"hi","hin","hin"},
-        {"my","mya","bur"},
-        {"sd","snd","snd"},
-        {"he","heb","heb"},
-        {"sa","san","san"},
-        {"mt","mlt","mlt"},
-        {"ms","msa","may"},
-        {"ha","hau","hau"},
-        {"mr","mar","mar"},
-        {"br","bre","bre"},
-        {"mo","mol","mol"},
-        {"bo","bod","tib"},
-        {"mn","mon","mon"},
-        {"bn","ben","ben"},
-        {"ml","mal","mal"},
-        {"mk","mkd","mac"},
-        {"xh","xho","xho"},
-        {"mi","mri","mao"},
-        {"bi","bis","bis"},
-        {"bh","bih","bih"},
-        {"mg","mlg","mlg"},
-        {"bg","bul","bul"},
-        {"rw","kin","kin"},
-        {"be","bel","bel"},
-        {"ru","rus","rus"},
-        {"gu","guj","guj"},
-        {"ba","bak","bak"},
-        {"ro","ron","rum"},
-        {"rm","roh","roh"},
-        {"gn","grn","grn"},
-        {"az","aze","aze"},
-        {"ay","aym","aym"},
-        {"gd","gla","gla"},
-        {"lv","lav","lav"},
-        {"lt","lit","lit"},
-        {"ga","gle","gle"},
-        {"as","asm","asm"},
-        {"ar","ara","ara"},
-        {"wo","wol","wol"},
-        {"ln","lin","lin"},
-        {"am","amh","amh"},
-        {"fy","fry","fry"},
-        {"af","afr","afr"},
-        {"qu","que","que"},
-        {"ab","abk","abk"},
-        {"la","lat","lat"},
-        {"aa","aar","aar"},
-        {"fr","fra","fre"},
-        {"fo","fao","fao"},
-        {"fj","fij","fij"},
-        {"fi","fin","fin"},
-        {"ky","kir","kir"},
-        {"ku","kur","kur"},
-        {"fa","fas","per"},
-        {"ks","kas","kas"},
-        {"vo","vol","vol"},
-        {"ko","kor","kor"},
-        {"kn","kan","kan"},
-        {"kk","kaz","kaz"},
-        {"vi","vie","vie"},
-    };
-
-/*
-    The following code was used to generate the table above from the two ISO standards.
-    It matches the language names (not the codes) from both standards to associate
-    the two and three letter codes.
-
-    private static final String ISO639 = "d:\\temp\\iso639.txt";
-    private static final String ISO6392 = "d:\\temp\\iso-639-2.txt";
-    private static void generateTables() {
-        try {
-            BufferedReader ISO639File = new BufferedReader(new FileReader(ISO639));
-            Hashtable i639 = new Hashtable();
-            for (String line = ISO639File.readLine(); line != null; line = ISO639File.readLine()) {
-                if (!line.startsWith("#")) {
-                    final int ndx = line.indexOf(' ');
-                    final String arg1 = line.substring(0, ndx);
-                    final int ndx2 = line.indexOf(' ', ndx+1);
-                    final String arg2 = line.substring(ndx+1, ndx2 < 0 ? line.length() : ndx2);
-                    i639.put(arg1, arg2);
-                }
-            }
-
-            BufferedReader ISO6392File = new BufferedReader(new FileReader(ISO6392));
-            Hashtable i6392 = new Hashtable();
-            for (String line = ISO6392File.readLine(); line != null; line = ISO6392File.readLine()) {
-                final int ndx = line.indexOf(' ');
-                final int ndx2 = line.indexOf(' ', ndx+1);
-                int ndx3 = line.indexOf(' ', ndx2+1);
-                if (ndx3 < 0) ndx3 = line.length();
-                final String arg1 = line.substring(0, ndx);
-                final String arg2 = line.substring(ndx+1, ndx2);
-                final String arg3 = line.substring(ndx2+1, ndx3);
-                i6392.put(arg3, new ISO6392Entry(arg1, arg2));
-            }
-
-            Enumeration keys = i639.keys();
-            while (keys.hasMoreElements()) {
-                final Object key = keys.nextElement();
-                final Object name = i639.get(key);
-                final Object value = i6392.get(name);
-
-                if (value != null) {
-                    System.out.print("{");
-                    System.out.print("\""+key+"\",");
-                    System.out.print(value);
-                    System.out.println("},");
-                }
-            }
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-    }
-
-
-    private static final class ISO6392Entry {
-        public final String code;
-        public final String name;
-        public ISO6392Entry(String code, String name) {
-            this.code = code;
-            this.name = name;
-        }
-        public String toString() {
-            return "\""+code+"\",\""+name+"\"";
-        }
-
-    }
-*/
-
-}
-
-/*
-
-data from ftp://dkuug.dk on March 4, 1999
-verified by http://www.triacom.com/archive/iso639-2.en.html
-
-iso 639 data
-aa Afar
-ab Abkhazian
-af Afrikaans
-am Amharic
-ar Arabic
-as Assamese
-ay Aymara
-az Azerbaijani
-ba Bashkir
-be Belarussian
-bg Bulgarian
-bh Bihari
-bi Bislama
-bn Bengali
-bo Tibetan
-br Breton
-ca Catalan
-co Corsican
-cs Czech
-cy Welsh
-da Danish
-de German
-dz Bhutani
-el Greek
-en English
-eo Esperanto
-es Spanish
-et Estonian
-eu Basque
-fa Persian
-fi Finnish
-fj Fijian
-fo Faroese
-fr French
-fy Frisian
-ga Irish
-gd Gaelic
-gl Galician
-gn Guarani
-gu Gujarati
-ha Hausa
-he Hebrew
-hi Hindi
-hr Croatian
-hu Hungarian
-hy Armenian
-ia Interlingua
-id Indonesian
-ie Interlingue
-ik Inupiak
-is Icelandic
-it Italian
-iu Inuktitut
-ja Japanese
-jw Javanese
-ka Georgian
-kk Kazakh
-kl Greenlandic
-km Cambodian
-kn Kannada
-ko Korean
-ks Kashmiri
-ku Kurdish
-ky Kirghiz
-la Latin
-ln Lingala
-lo Laothian
-lt Lithuanian
-lv Latvian
-mg Malagasy
-mi Maori
-mk Macedonian
-ml Malayalam
-mn Mongolian
-mo Moldavian
-mr Marathi
-ms Malay
-mt Maltese
-my Burmese
-na Nauru
-ne Nepali
-nl Dutch
-no Norwegian
-oc Occitan
-om Oromo
-or Oriya
-pa Punjabi
-pl Polish
-ps Pushto
-pt Portuguese
-qu Quechua
-rm Raeto-Romance
-rn Kirundi
-ro Romanian
-ru Russian
-rw Kinyarwanda
-sa Sanskrit
-sd Sindhi
-sg Sangho
-sh Croatian (Serbo)
-si Sinhalese
-sk Slovak
-sl Slovenian
-sm Samoan
-sn Shona
-so Somali
-sq Albanian
-sr Serbian
-ss Siswati
-st Sesotho
-su Sundanese
-sv Swedish
-sw Swahili
-ta Tamil
-te Telugu
-tg Tajik
-th Thai
-ti Tigrinya
-tk Turkmen
-tl Tagalog
-tn Setswana
-to Tonga
-tr Turkish
-ts Tsonga
-tt Tatar
-tw Twi
-ug Uighur
-uk Ukrainian
-ur Urdu
-uz Uzbek
-vi Vietnamese
-vo Volapuk
-wo Wolof
-xh Xhosa
-yi Yiddish
-yo Yoruba
-za Zhuang
-zh Chinese
-zu Zulu
-
-ISO 639-2 data
-
-aar aar Afar
-abk abk Abkhazian
-ace ace Achinese
-ach ach Acoli
-ada ada Adangme
-afa afa Afro-Asiatic (Other)
-afh afh Afrihili
-afr afr Afrikaans
-aka aka Akan
-akk akk Akkadian
-ale ale Aleut
-alg alg Algonquian languages
-amh amh Amharic
-ang ang English-Old (ca. 450-1100)
-apa apa Apache languages
-ara ara Arabic
-arc arc Aramaic
-arn arn Araucanian
-arp arp Arapaho
-art art Artificial (Other)
-arw arw Arawak
-asm asm Assamese
-ath ath Athapascan languages
-aus aus Australian languages
-ava ava Avaric
-ave ave Avestan
-awa awa Awadhi
-aym aym Aymara
-aze aze Azerbaijani
-bad bad Banda
-bai bai Bamileke languages
-bak bak Bashkir
-bal bal Baluchi
-bam bam Bambara
-ban ban Balinese
-bas bas Basa
-bat bat Baltic (Other)
-bej bej Beja
-bel bel Belarussian
-bem bem Bemba
-ben ben Bengali
-ber ber Berber (Other)
-bho bho Bhojpuri
-bih bih Bihari
-bik bik Bikol
-bin bin Bini
-bis bis Bislama
-bla bla Siksika
-bnt bnt Bantu (Other)
-bod tib Tibetan
-bra bra Braj
-bre bre Breton
-btk btk Batak (Indonesia)
-bua bua Buriat
-bug bug Buginese
-bul bul Bulgarian
-cad cad Caddo
-cai cai Central-American-Indian (Other)
-car car Carib
-cat cat Catalan
-cau cau Caucasian (Other)
-ceb ceb Cebuano
-cel cel Celtic (Other)
-ces cze Czech
-cha cha Chamorro
-chb chb Chibcha
-che che Chechen
-chg chg Chagatai
-chk chk Chuukese
-chm chm Mari
-chn chn Chinook-jargon
-cho cho Choctaw
-chp chp Chipewyan
-chr chr Cherokee
-chu chu Church-Slavic
-chv chv Chuvash
-chy chy Cheyenne
-cmc cmc Chamic languages
-cop cop Coptic
-cor cor Cornish
-cos cos Corsican
-cpe cpe Creoles-and-pidgins-English-based (Other)
-cpf cpf Creoles-and-pidgins-French-based (Other)
-cpp cpp Creoles-and-pidgins-Portuguese-based (Other)
-cre cre Cree
-crp crp Creoles-and-pidgins (Other)
-cus cus Cushitic (Other)
-cym wel Welsh
-dak dak Dakota
-dan dan Danish
-day day Dayak
-del del Delaware
-den den Slave (Athapascan)
-deu ger German
-dgr dgr Dogrib
-din din Dinka
-div div Divehi
-doi doi Dogri
-dra dra Dravidian (Other)
-dua dua Duala
-dum dum Dutch-Middle (ca. 1050-1350)
-dyu dyu Dyula
-dzo dzo Dzongkha
-efi efi Efik
-egy egy Egyptian (Ancient)
-eka eka Ekajuk
-ell gre Greek Modern (post 1453)
-elx elx Elamite
-eng eng English
-enm enm English-Middle (1100-1500)
-epo epo Esperanto
-est est Estonian
-eus baq Basque
-ewe ewe Ewe
-ewo ewo Ewondo
-fan fan Fang
-fao fao Faroese
-fas per Persian
-fat fat Fanti
-fij fij Fijian
-fin fin Finnish
-fiu fiu Finno-Ugrian (Other)
-fon fon Fon
-fra fre French
-frm frm French-Middle (ca. 1400-1600)
-fro fro French-Old (842-ca. 1400)
-fry fry Frisian
-ful ful Fulah
-fur fur Friulian
-gaa gaa Ga
-gay gay Gayo
-gba gba Gbaya
-gem gem Germanic (Other)
-gez gez Geez
-gil gil Gilbertese
-gdh gae Gaelic
-gai iri Irish
-glg glg Gallegan
-glv glv Manx
-gmh gmh German-Middle High (ca. 1050-1500)
-goh goh German-Old High (ca. 750-1050)
-gon gon Gondi
-gor gor Gorontalo
-got got Gothic
-grb grb Grebo
-grc grc Greek-Ancient (to 1453)
-grn grn Guarani
-guj guj Gujarati
-gwi gwi Gwich'in
-hai hai Haida
-hau hau Hausa
-haw haw Hawaiian
-heb heb Hebrew
-her her Herero
-hil hil Hiligaynon
-him him Himachali
-hin hin Hindi
-hit hit Hittite
-hmn hmn Hmong
-hmo hmo Hiri Motu
-hrv scr Croatian
-hun hun Hungarian
-hup hup Hupa
-hye arm Armenian
-iba iba Iban
-ibo ibo Igbo
-ijo ijo Ijo
-iku iku Inuktitut
-ile ile Interlingue
-ilo ilo Iloko
-ina ina Interlingua (International Auxilary Language Association)
-inc inc Indic (Other)
-ind ind Indonesian
-ine ine Indo-European (Other)
-ipk ipk Inupiak
-ira ira Iranian (Other)
-iro iro Iroquoian languages
-isl ice Icelandic
-ita ita Italian
-jaw jav Javanese
-jpn jpn Japanese
-jpr jpr Judeo-Persian
-jrb jrb Judeo-Arabic
-kaa kaa Kara-Kalpak
-kab kab Kabyle
-kac kac Kachin
-kal kal Kalaallisut
-kam kam Kamba
-kan kan Kannada
-kar kar Karen
-kas kas Kashmiri
-kat geo Georgian
-kau kau Kanuri
-kaw kaw Kawi
-kaz kaz Kazakh
-kha kha Khasi
-khi khi Khoisan (Other)
-khm khm Khmer
-kho kho Khotanese
-kik kik Kikuyu
-kin kin Kinyarwanda
-kir kir Kirghiz
-kmb kmb Kimbundu
-kok kok Konkani
-kom kom Komi
-kon kon Kongo
-kor kor Korean
-kos kos Kosraean
-kpe kpe Kpelle
-kro kro Kru
-kru kru Kurukh
-kua kua Kuanyama
-kum kum Kumyk
-kur kur Kurdish
-kut kut Kutenai
-lad lad Ladino
-lah lah Lahnda
-lam lam Lamba
-lao lao Lao
-lat lat Latin
-lav lav Latvian
-lez lez Lezghian
-lin lin Lingala
-lit lit Lithuanian
-lol lol Mongo
-loz loz Lozi
-ltz ltz Letzeburgesch
-lua lua Luba-Lulua
-lub lub Luba-Katanga
-lug lug Ganda
-lui lui Luiseno
-lun lun Lunda
-luo luo Luo (Kenya and Tanzania)
-lus lus Lushai
-mad mad Madurese
-mag mag Magahi
-mah mah Marshall
-mai mai Maithili
-mak mak Makasar
-mal mal Malayalam
-man man Mandingo
-map map Austronesian (Other)
-mar mar Marathi
-mas mas Masai
-mdr mdr Mandar
-men men Mende
-mga mga Irish-Middle (900-1200)
-mic mic Micmac
-min min Minangkabau
-mis mis Miscellaneous languages
-mkd mac Macedonian
-mkh mkh Mon-Khmer (Other)
-mlg mlg Malagasy
-mlt mlt Maltese
-mni mni Manipuri
-mno mno Manobo languages
-moh moh Mohawk
-mol mol Moldavian
-mon mon Mongolian
-mos mos Mossi
-mri mao Maori
-msa may Malay
-mul mul Multiple languages
-mun mun Munda languages
-mus mus Creek
-mwr mwr Marwari
-mya bur Burmese
-myn myn Mayan languages
-nah nah Nahuatl
-nai nai North American Indian (Other)
-nau nau Nauru
-nav nav Navajo
-nbl nbl Ndebele, South
-nde nde Ndebele, North
-ndo ndo Ndonga
-nep nep Nepali
-new new Newari
-nia nia Nias
-nic nic Niger-Kordofanian (Other)
-niu niu Niuean
-nld dut Dutch
-non non Norse, Old
-nor nor Norwegian
-nso nso Sohto, Northern
-nub nub Nubian languages
-nya nya Nyanja
-nym nym Nyamwezi
-nyn nyn Nyankole
-nyo nyo Nyoro
-nzi nzi Nzima
-oci oci Occitan (post 1500)
-oji oji Ojibwa
-ori ori Oriya
-orm orm Oromo
-osa osa Osage
-oss oss Ossetic
-ota ota Turkish, Ottoman (1500-1928)
-oto oto Otomian languages
-paa paa Papuan (Other)
-pag pag Pangasinan
-pal pal Pahlavi
-pam pam Pampanga
-pan pan Panjabi
-pap pap Papiamento
-pau pau Palauan
-peo peo Persian, Old (ca. 600-400 B.C.)
-phi phi Philippine (Other)
-phn phn Phoenician
-pli pli Pali
-pol pol Polish
-pon pon Pohnpeian
-por por Portuguese
-pra pra Prakrit languages
-pro pro Proven\u00E7al, Old (to 1500)
-pus pus Pushto
-qaa-qtz qaa-qtz Reserved for local use
-que que Quechua
-raj raj Rajasthani
-rap rap Rapanui
-rar rar Rarotongan
-roa roa Romance (Other)
-roh roh Raeto-Romance
-rom rom Romany
-ron rum Romanian
-run run Rundi
-rus rus Russian
-sad sad Sandawe
-sag sag Sango
-sah sah Yakut
-sai sai South American Indian (Other)
-sal sal Salishan languages
-sam sam Samaritan Aramaic
-san san Sanskrit
-sas sas Sasak
-sat sat Santali
-sco sco Scots
-sel sel Selkup
-sem sem Semitic (Other)
-sga sga Irish-Old (to 900)
-shn shn Shan
-sid sid Sidamo
-sin sin Sinhalese
-sio sio Siouan languages
-sit sit Sino-Tibetan (Other)
-sla sla Slavic (Other)
-slk slo Slovak
-slv slv Slovenian
-smi smi Sami languages
-smo smo Samoan
-sna sna Shona
-snd snd Sindhi
-snk snk Soninke
-sog sog Sogdian
-som som Somali
-son son Songhai
-sot sot Sotho Southern
-spa spa Spanish
-sqi alb Albanian
-srd srd Sardinian
-srp scc Serbian
-srr srr Serer
-ssa ssa Nilo-Saharan (Other)
-ssw ssw Swati
-suk suk Sukuma
-sun sun Sundanese
-sus sus Susu
-sux sux Sumerian
-swa swa Swahili
-swe swe Swedish
-syr syr Syriac
-tah tah Tahitian
-tai tai Tai (Other)
-tam tam Tamil
-tat tat Tatar
-tel tel Telugu
-tem tem Timne
-ter ter Tereno
-tet tet Tetum
-tgk tgk Tajik
-tgl tgl Tagalog
-tha tha Thai
-tig tig Tigre
-tir tir Tigrinya
-tiv tiv Tiv
-tkl tkl Tokelau
-tli tli Tlingit
-tmh tmh Tamashek
-tog tog Tonga (Nyasa)
-ton ton Tonga (Tonga Islands)
-tpi tpi Tok Pisin
-tsi tsi Tsimshian
-tsn tsn Tswana
-tso tso Tsonga
-tuk tuk Turkmen
-tum tum Tumbuka
-tur tur Turkish
-tut tut Altaic
-tvl tvl Tuvalu
-twi twi Twi
-tyv tyv Tuvinian
-uga uga Ugaritic
-uig uig Uighur
-ukr ukr Ukrainian
-umb umb Umbundu
-und und Undetermined
-urd urd Urdu
-uzb uzb Uzbek
-vai vai Vai
-ven ven Venda
-vie vie Vietnamese
-vol vol Volapuk
-vot vot Votic
-wak wak Wakashan
-wal wal Walamo
-war war Waray
-was was Washo
-wen wen Sorbian
-wol wol Wolof
-xho xho Xhosa
-yao yao Yao
-yap yap Yapese
-yid yid Yiddish
-yor yor Yoruba
-ypk ypk Yupik
-zap zap Zapotec
-zen zen Zenaga
-zha zha Zhuang
-zho chi Chinese
-znd znd Zande
-zul zul Zulu
-zun zun Zuni
-
-*/
diff --git a/test/jdk/java/util/Locale/Bug8025703.java b/test/jdk/java/util/Locale/Bug8025703.java
deleted file mode 100644
index 8a694aecb7b..00000000000
--- a/test/jdk/java/util/Locale/Bug8025703.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2013, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 8025703
- * @summary Verify implementation for Locale matching.
- * @run main Bug8025703
- */
-
-import java.util.*;
-import java.util.Locale.LanguageRange;
-
-public class Bug8025703 {
-
-    public static void main(String[] args) {
-        boolean err = false;
-
-        String[][] mappings = {{"ilw", "gal"},
-                               {"meg", "cir"},
-                               {"pcr", "adx"},
-                               {"xia", "acn"},
-                               {"yos", "zom"}};
-
-        for (int i = 0; i < mappings.length; i++) {
-            List<LanguageRange> got = LanguageRange.parse(mappings[i][0]);
-            ArrayList<LanguageRange> expected = new ArrayList<>();
-            expected.add(new LanguageRange(mappings[i][0], 1.0));
-            expected.add(new LanguageRange(mappings[i][1], 1.0));
-
-            if (!expected.equals(got)) {
-                err = true;
-                System.err.println("Incorrect language ranges. ");
-                for (LanguageRange lr : expected) {
-                    System.err.println("  Expected: range="
-                        + lr.getRange() + ", weight=" + lr.getWeight());
-                }
-                for (LanguageRange lr : got) {
-                    System.err.println("  Got:      range="
-                        + lr.getRange() + ", weight=" + lr.getWeight());
-                }
-            }
-        }
-
-        if (err) {
-            throw new RuntimeException("Failed.");
-        }
-    }
-
-}
-
diff --git a/test/jdk/java/util/Locale/Bug8032842.java b/test/jdk/java/util/Locale/Bug8032842.java
deleted file mode 100644
index 92f36a6dcfd..00000000000
--- a/test/jdk/java/util/Locale/Bug8032842.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * @test
- * @bug 8032842 8175539
- * @summary Checks that the filterTags() and lookup() methods
- *          preserve the case of matching language tag(s).
- *          Before 8032842 fix these methods return the matching
- *          language tag(s) in lowercase.
- *          Also, checks the filterTags() to return only unique
- *          (ignoring case considerations) matching tags.
- *
- */
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Locale.FilteringMode;
-import java.util.Locale.LanguageRange;
-
-public class Bug8032842 {
-
-    public static void main(String[] args) {
-
-        // test filterBasic() for preserving the case of matching tags for
-        // the language range '*', with no duplicates in the matching tags
-        testFilter("*", List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP",
-                "JA-JP", "en-GB"),
-                List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
-                FilteringMode.AUTOSELECT_FILTERING);
-
-        // test filterBasic() for preserving the case of matching tags for
-        // basic ranges other than *, with no duplicates in the matching tags
-        testFilter("mtm-RU, en-GB", List.of("En-Gb", "mTm-RU", "en-US",
-                "en-latn", "en-GB"),
-                List.of("mTm-RU", "En-Gb"), FilteringMode.AUTOSELECT_FILTERING);
-
-        // test filterExtended() for preserving the case of matching tags for
-        // the language range '*', with no duplicates in the matching tags
-        testFilter("*", List.of("de-CH", "hi-in", "En-GB", "hi-IN",
-                "ja-Latn-JP", "JA-JP"),
-                List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
-                FilteringMode.EXTENDED_FILTERING);
-
-        // test filterExtended() for preserving the case of matching tags for
-        // extended ranges other than *, with no duplicates in the matching tags
-        testFilter("*-ch;q=0.5, *-Latn;q=0.4", List.of("fr-CH", "de-Ch",
-                "en-latn", "en-US", "en-Latn"),
-                List.of("fr-CH", "de-Ch", "en-latn"),
-                FilteringMode.EXTENDED_FILTERING);
-
-        // test lookupTag() for preserving the case of matching tag
-        testLookup("*-ch;q=0.5", List.of("en", "fR-cH"), "fR-cH");
-
-    }
-
-    public static void testFilter(String ranges, List<String> tags,
-            List<String> expected, FilteringMode mode) {
-        List<LanguageRange> priorityList = LanguageRange.parse(ranges);
-        List<String> actual = Locale.filterTags(priorityList, tags, mode);
-        if (!actual.equals(expected)) {
-            throw new RuntimeException("[filterTags() failed for the language"
-                    + " range: " + ranges + ", Expected: " + expected
-                    + ", Found: " + actual + "]");
-        }
-    }
-
-    public static void testLookup(String ranges, List<String> tags,
-            String expected) {
-        List<LanguageRange> priorityList = LanguageRange.parse(ranges);
-        String actual = Locale.lookupTag(priorityList, tags);
-        if (!actual.equals(expected)) {
-            throw new RuntimeException("[lookupTag() failed for the language"
-                    + " range: " + ranges + ", Expected: " + expected
-                    + ", Found: " + actual + "]");
-        }
-    }
-
-}
-
diff --git a/test/jdk/java/util/Locale/Bug8008577.java b/test/jdk/java/util/Locale/ExpectedAdapterTypes.java
similarity index 59%
rename from test/jdk/java/util/Locale/Bug8008577.java
rename to test/jdk/java/util/Locale/ExpectedAdapterTypes.java
index ee267ecfa06..60c24b01fb5 100644
--- a/test/jdk/java/util/Locale/Bug8008577.java
+++ b/test/jdk/java/util/Locale/ExpectedAdapterTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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,27 +25,36 @@
  * @test
  * @bug 8008577 8138613
  * @summary Check whether CLDR locale provider adapter is enabled by default
- * @compile -XDignore.symbol.file Bug8008577.java
+ * @compile -XDignore.symbol.file ExpectedAdapterTypes.java
  * @modules java.base/sun.util.locale.provider
- * @run main Bug8008577
+ * @run junit ExpectedAdapterTypes
  */
 
 import java.util.Arrays;
 import java.util.List;
 import sun.util.locale.provider.LocaleProviderAdapter;
 
-public class Bug8008577 {
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ExpectedAdapterTypes {
 
     static final LocaleProviderAdapter.Type[] expected = {
         LocaleProviderAdapter.Type.CLDR,
         LocaleProviderAdapter.Type.JRE,
     };
 
-    public static void main(String[] args) {
-        List<LocaleProviderAdapter.Type> types = LocaleProviderAdapter.getAdapterPreference();
-        List<LocaleProviderAdapter.Type> expectedList = Arrays.asList(expected);
-        if (!types.equals(expectedList)) {
-            throw new RuntimeException("Default locale provider adapter list is incorrect");
-        }
+    /**
+     * This test ensures LocaleProviderAdapter.getAdapterPreference() returns
+     * the correct preferred adapter types. This test should fail whenever a change is made
+     * to the implementation and the expected list is not updated accordingly.
+     */
+    @Test
+    public void correctAdapterListTest() {
+        List<LocaleProviderAdapter.Type> actualTypes = LocaleProviderAdapter.getAdapterPreference();
+        List<LocaleProviderAdapter.Type> expectedTypes = Arrays.asList(expected);
+        assertEquals(actualTypes, expectedTypes, String.format("getAdapterPreference() " +
+                "returns: %s, but the expected adapter list returns: %s", actualTypes, expectedTypes));
     }
 }
diff --git a/test/jdk/java/util/Locale/Bug8071929.java b/test/jdk/java/util/Locale/ISO3166.java
similarity index 93%
rename from test/jdk/java/util/Locale/Bug8071929.java
rename to test/jdk/java/util/Locale/ISO3166.java
index 19a316ac217..7472ea1a4a4 100644
--- a/test/jdk/java/util/Locale/Bug8071929.java
+++ b/test/jdk/java/util/Locale/ISO3166.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
@@ -27,7 +27,9 @@
  * @summary Test obsolete ISO3166-1 alpha-2 country codes should not be retrieved.
  * ISO3166-1 alpha-2, ISO3166-1 alpha-3, ISO3166-3 country codes
  * from overloaded getISOCountries(Iso3166 type) are retrieved correctly.
+ * @run junit ISO3166
  */
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -35,7 +37,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class Bug8071929 {
+import org.junit.jupiter.api.Test;
+
+public class ISO3166 {
 
     private static final List<String> ISO3166_1_ALPHA2_OBSOLETE_CODES = List.of("AN", "BU", "CS",
             "NT", "SF", "TP", "YU", "ZR");
@@ -78,7 +82,8 @@ public class Bug8071929 {
      * This method checks that obsolete ISO3166-1 alpha-2 country codes are not
      * retrieved in output of getISOCountries() method.
      */
-    private static void checkISO3166_1_Alpha2ObsoleteCodes() {
+    @Test
+    public void checkISO3166_1_Alpha2ObsoleteCodes() {
         Set<String> unexpectedCodes = ISO3166_1_ALPHA2_OBSOLETE_CODES.stream().
                 filter(Set.of(Locale.getISOCountries())::contains).collect(Collectors.toSet());
         if (!unexpectedCodes.isEmpty()) {
@@ -91,7 +96,8 @@ private static void checkISO3166_1_Alpha2ObsoleteCodes() {
      * This method checks that ISO3166-3 country codes which are PART3 of
      * IsoCountryCode enum, are retrieved correctly.
      */
-    private static void checkISO3166_3Codes() {
+    @Test
+    public void checkISO3166_3Codes() {
         Set<String> iso3166_3Codes = Locale.getISOCountries(IsoCountryCode.PART3);
         if (!iso3166_3Codes.equals(ISO3166_3EXPECTED)) {
             reportDifference(iso3166_3Codes, ISO3166_3EXPECTED);
@@ -102,7 +108,8 @@ private static void checkISO3166_3Codes() {
      * This method checks that ISO3166-1 alpha-3 country codes which are
      * PART1_ALPHA3 of IsoCountryCode enum, are retrieved correctly.
      */
-    private static void checkISO3166_1_Alpha3Codes() {
+    @Test
+    public void checkISO3166_1_Alpha3Codes() {
         Set<String> iso3166_1_Alpha3Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA3);
         if (!iso3166_1_Alpha3Codes.equals(ISO3166_1_ALPHA3_EXPECTED)) {
             reportDifference(iso3166_1_Alpha3Codes, ISO3166_1_ALPHA3_EXPECTED);
@@ -113,7 +120,8 @@ private static void checkISO3166_1_Alpha3Codes() {
      * This method checks that ISO3166-1 alpha-2 country codes, which are
      * PART1_ALPHA2 of IsoCountryCode enum, are retrieved correctly.
      */
-    private static void checkISO3166_1_Alpha2Codes() {
+    @Test
+    public void checkISO3166_1_Alpha2Codes() {
         Set<String> iso3166_1_Alpha2Codes = Locale.getISOCountries(IsoCountryCode.PART1_ALPHA2);
         Set<String> ISO3166_1_ALPHA2_EXPECTED = Set.of(Locale.getISOCountries());
         if (!iso3166_1_Alpha2Codes.equals(ISO3166_1_ALPHA2_EXPECTED)) {
@@ -139,11 +147,4 @@ private static void reportDifference(Set<String> retrievedCountrySet, Set<String
                     + expectedSet);
         }
     }
-
-    public static void main(String[] args) {
-        checkISO3166_1_Alpha2ObsoleteCodes();
-        checkISO3166_1_Alpha2Codes();
-        checkISO3166_1_Alpha3Codes();
-        checkISO3166_3Codes();
-    }
 }
diff --git a/test/jdk/java/util/Locale/ISO639.java b/test/jdk/java/util/Locale/ISO639.java
new file mode 100644
index 00000000000..07d816c5371
--- /dev/null
+++ b/test/jdk/java/util/Locale/ISO639.java
@@ -0,0 +1,295 @@
+/*
+ * 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary test ISO639-2 language codes
+ * @library /java/text/testlib
+ * @compile -encoding ascii ISO639.java
+ * @bug 4175998 8303917
+ * @run junit ISO639
+ */
+
+/*
+ *
+ *
+ * (C) Copyright IBM Corp. 1998 - All Rights Reserved
+ *
+ * The original version of this source code and documentation is
+ * copyrighted and owned by IBM. These materials are provided
+ * under terms of a License Agreement between IBM and Sun.
+ * This technology is protected by multiple US and International
+ * patents. This notice and attribution to IBM may not be removed.
+ *
+ */
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ISO639 {
+
+    /**
+     * This test verifies for a given locale created from the ISO639 2-letter code,
+     * the correct ISO639 3-letter code is returned when calling getISO3Language().
+     */
+    @ParameterizedTest
+    @MethodSource("expectedISO639Codes")
+    public void ISO3LetterTest(String ISO2, String expectedISO3) {
+        Locale loc = new Locale(ISO2);
+        String actualISO3 = loc.getISO3Language();
+        assertEquals(actualISO3, expectedISO3,
+                String.format("The Locale '%s' returned a bad ISO3 language code. " +
+                        "Got '%s' instead of '%s'", loc, actualISO3, expectedISO3));
+    }
+
+    // expectedISO639Codes generated from https://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt
+    // on March 9th, 2023.
+    private static Stream<Arguments> expectedISO639Codes() {
+        return Stream.of(
+             Arguments.of("aa","aar","aar"),
+             Arguments.of("ab","abk","abk"),
+             Arguments.of("af","afr","afr"),
+             Arguments.of("ak","aka","aka"),
+             Arguments.of("sq","sqi","alb"),
+             Arguments.of("am","amh","amh"),
+             Arguments.of("ar","ara","ara"),
+             Arguments.of("an","arg","arg"),
+             Arguments.of("hy","hye","arm"),
+             Arguments.of("as","asm","asm"),
+             Arguments.of("av","ava","ava"),
+             Arguments.of("ae","ave","ave"),
+             Arguments.of("ay","aym","aym"),
+             Arguments.of("az","aze","aze"),
+             Arguments.of("ba","bak","bak"),
+             Arguments.of("bm","bam","bam"),
+             Arguments.of("eu","eus","baq"),
+             Arguments.of("be","bel","bel"),
+             Arguments.of("bn","ben","ben"),
+             Arguments.of("bh","bih","bih"),
+             Arguments.of("bi","bis","bis"),
+             Arguments.of("bs","bos","bos"),
+             Arguments.of("br","bre","bre"),
+             Arguments.of("bg","bul","bul"),
+             Arguments.of("my","mya","bur"),
+             Arguments.of("ca","cat","cat"),
+             Arguments.of("ch","cha","cha"),
+             Arguments.of("ce","che","che"),
+             Arguments.of("zh","zho","chi"),
+             Arguments.of("cu","chu","chu"),
+             Arguments.of("cv","chv","chv"),
+             Arguments.of("kw","cor","cor"),
+             Arguments.of("co","cos","cos"),
+             Arguments.of("cr","cre","cre"),
+             Arguments.of("cs","ces","cze"),
+             Arguments.of("da","dan","dan"),
+             Arguments.of("dv","div","div"),
+             Arguments.of("nl","nld","dut"),
+             Arguments.of("dz","dzo","dzo"),
+             Arguments.of("en","eng","eng"),
+             Arguments.of("eo","epo","epo"),
+             Arguments.of("et","est","est"),
+             Arguments.of("ee","ewe","ewe"),
+             Arguments.of("fo","fao","fao"),
+             Arguments.of("fj","fij","fij"),
+             Arguments.of("fi","fin","fin"),
+             Arguments.of("fr","fra","fre"),
+             Arguments.of("fy","fry","fry"),
+             Arguments.of("ff","ful","ful"),
+             Arguments.of("ka","kat","geo"),
+             Arguments.of("de","deu","ger"),
+             Arguments.of("gd","gla","gla"),
+             Arguments.of("ga","gle","gle"),
+             Arguments.of("gl","glg","glg"),
+             Arguments.of("gv","glv","glv"),
+             Arguments.of("el","ell","gre"),
+             Arguments.of("gn","grn","grn"),
+             Arguments.of("gu","guj","guj"),
+             Arguments.of("ht","hat","hat"),
+             Arguments.of("ha","hau","hau"),
+             Arguments.of("he","heb","heb"),
+             Arguments.of("hz","her","her"),
+             Arguments.of("hi","hin","hin"),
+             Arguments.of("ho","hmo","hmo"),
+             Arguments.of("hr","hrv","hrv"),
+             Arguments.of("hu","hun","hun"),
+             Arguments.of("ig","ibo","ibo"),
+             Arguments.of("is","isl","ice"),
+             Arguments.of("io","ido","ido"),
+             Arguments.of("ii","iii","iii"),
+             Arguments.of("iu","iku","iku"),
+             Arguments.of("ie","ile","ile"),
+             Arguments.of("ia","ina","ina"),
+             Arguments.of("id","ind","ind"),
+             Arguments.of("ik","ipk","ipk"),
+             Arguments.of("it","ita","ita"),
+             Arguments.of("jv","jav","jav"),
+             Arguments.of("ja","jpn","jpn"),
+             Arguments.of("kl","kal","kal"),
+             Arguments.of("kn","kan","kan"),
+             Arguments.of("ks","kas","kas"),
+             Arguments.of("kr","kau","kau"),
+             Arguments.of("kk","kaz","kaz"),
+             Arguments.of("km","khm","khm"),
+             Arguments.of("ki","kik","kik"),
+             Arguments.of("rw","kin","kin"),
+             Arguments.of("ky","kir","kir"),
+             Arguments.of("kv","kom","kom"),
+             Arguments.of("kg","kon","kon"),
+             Arguments.of("ko","kor","kor"),
+             Arguments.of("kj","kua","kua"),
+             Arguments.of("ku","kur","kur"),
+             Arguments.of("lo","lao","lao"),
+             Arguments.of("la","lat","lat"),
+             Arguments.of("lv","lav","lav"),
+             Arguments.of("li","lim","lim"),
+             Arguments.of("ln","lin","lin"),
+             Arguments.of("lt","lit","lit"),
+             Arguments.of("lb","ltz","ltz"),
+             Arguments.of("lu","lub","lub"),
+             Arguments.of("lg","lug","lug"),
+             Arguments.of("mk","mkd","mac"),
+             Arguments.of("mh","mah","mah"),
+             Arguments.of("ml","mal","mal"),
+             Arguments.of("mi","mri","mao"),
+             Arguments.of("mr","mar","mar"),
+             Arguments.of("ms","msa","may"),
+             Arguments.of("mg","mlg","mlg"),
+             Arguments.of("mt","mlt","mlt"),
+             Arguments.of("mn","mon","mon"),
+             Arguments.of("na","nau","nau"),
+             Arguments.of("nv","nav","nav"),
+             Arguments.of("nr","nbl","nbl"),
+             Arguments.of("nd","nde","nde"),
+             Arguments.of("ng","ndo","ndo"),
+             Arguments.of("ne","nep","nep"),
+             Arguments.of("nn","nno","nno"),
+             Arguments.of("nb","nob","nob"),
+             Arguments.of("no","nor","nor"),
+             Arguments.of("ny","nya","nya"),
+             Arguments.of("oc","oci","oci"),
+             Arguments.of("oj","oji","oji"),
+             Arguments.of("or","ori","ori"),
+             Arguments.of("om","orm","orm"),
+             Arguments.of("os","oss","oss"),
+             Arguments.of("pa","pan","pan"),
+             Arguments.of("fa","fas","per"),
+             Arguments.of("pi","pli","pli"),
+             Arguments.of("pl","pol","pol"),
+             Arguments.of("pt","por","por"),
+             Arguments.of("ps","pus","pus"),
+             Arguments.of("qu","que","que"),
+             Arguments.of("rm","roh","roh"),
+             Arguments.of("ro","ron","rum"),
+             Arguments.of("rn","run","run"),
+             Arguments.of("ru","rus","rus"),
+             Arguments.of("sg","sag","sag"),
+             Arguments.of("sa","san","san"),
+             Arguments.of("si","sin","sin"),
+             Arguments.of("sk","slk","slo"),
+             Arguments.of("sl","slv","slv"),
+             Arguments.of("se","sme","sme"),
+             Arguments.of("sm","smo","smo"),
+             Arguments.of("sn","sna","sna"),
+             Arguments.of("sd","snd","snd"),
+             Arguments.of("so","som","som"),
+             Arguments.of("st","sot","sot"),
+             Arguments.of("es","spa","spa"),
+             Arguments.of("sc","srd","srd"),
+             Arguments.of("sr","srp","srp"),
+             Arguments.of("ss","ssw","ssw"),
+             Arguments.of("su","sun","sun"),
+             Arguments.of("sw","swa","swa"),
+             Arguments.of("sv","swe","swe"),
+             Arguments.of("ty","tah","tah"),
+             Arguments.of("ta","tam","tam"),
+             Arguments.of("tt","tat","tat"),
+             Arguments.of("te","tel","tel"),
+             Arguments.of("tg","tgk","tgk"),
+             Arguments.of("tl","tgl","tgl"),
+             Arguments.of("th","tha","tha"),
+             Arguments.of("bo","bod","tib"),
+             Arguments.of("ti","tir","tir"),
+             Arguments.of("to","ton","ton"),
+             Arguments.of("tn","tsn","tsn"),
+             Arguments.of("ts","tso","tso"),
+             Arguments.of("tk","tuk","tuk"),
+             Arguments.of("tr","tur","tur"),
+             Arguments.of("tw","twi","twi"),
+             Arguments.of("ug","uig","uig"),
+             Arguments.of("uk","ukr","ukr"),
+             Arguments.of("ur","urd","urd"),
+             Arguments.of("uz","uzb","uzb"),
+             Arguments.of("ve","ven","ven"),
+             Arguments.of("vi","vie","vie"),
+             Arguments.of("vo","vol","vol"),
+             Arguments.of("cy","cym","wel"),
+             Arguments.of("wa","wln","wln"),
+             Arguments.of("wo","wol","wol"),
+             Arguments.of("xh","xho","xho"),
+             Arguments.of("yi","yid","yid"),
+             Arguments.of("yo","yor","yor"),
+             Arguments.of("za","zha","zha"),
+             Arguments.of("zu","zul","zul")
+        );
+    }
+
+    @Test
+    @Disabled("For updating expected ISO data, NOT an actual test")
+    public void getISOData() {
+        // Remove @Disabled to generate new ISO Data
+        generateTables();
+    }
+
+    private static final String ISO639 = "ISO-639-2_utf-8.txt";
+    private static void generateTables() {
+        try {
+            BufferedReader ISO639File = new BufferedReader(new FileReader(ISO639));
+            for (String line = ISO639File.readLine(); line != null; line = ISO639File.readLine()) {
+                String[] tokens= line.split("\\|");
+                String iso639_1 = tokens[2];
+                String iso639_2B = tokens[1];
+                String iso639_2T = tokens[0];
+                if (iso639_1.isEmpty()){
+                    continue; // Skip if not both a 639-1 and 639-2 code
+                }
+                if (iso639_2B.isEmpty()){
+                    iso639_2B = iso639_2T; // Default 639/B to 639/T if empty
+                }
+                System.out.printf("Arguments.of(\"%s\",\"%s\",\"%s\"),\n", iso639_1, iso639_2B, iso639_2T);
+            }
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+    }
+}
diff --git a/test/jdk/java/util/Locale/Bug8001562.java b/test/jdk/java/util/Locale/JDK7LocaleServiceDiffs.java
similarity index 71%
rename from test/jdk/java/util/Locale/Bug8001562.java
rename to test/jdk/java/util/Locale/JDK7LocaleServiceDiffs.java
index be53600a84d..a9acb23d10f 100644
--- a/test/jdk/java/util/Locale/Bug8001562.java
+++ b/test/jdk/java/util/Locale/JDK7LocaleServiceDiffs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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,9 +25,9 @@
  * @test
  * @bug 8001562
  * @summary Verify that getAvailableLocales() in locale sensitive services
- *     classes return compatible set of locales as in JDK7.
+ * classes return compatible set of locales as in JDK7.
  * @modules jdk.localedata
- * @run main Bug8001562
+ * @run junit JDK7LocaleServiceDiffs
  */
 
 import java.text.BreakIterator;
@@ -40,8 +40,13 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-public class Bug8001562 {
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class JDK7LocaleServiceDiffs {
 
     static final List<String> jdk7availTags = List.of(
             "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW",
@@ -72,27 +77,16 @@ public class Bug8001562 {
                 .collect(Collectors.toList());
     }
 
-    public static void main(String[] args) {
-        List<Locale> avail = Arrays.asList(BreakIterator.getAvailableLocales());
-        diffLocale(BreakIterator.class, avail);
-
-        avail = Arrays.asList(Collator.getAvailableLocales());
-        diffLocale(Collator.class, avail);
-
-        avail = Arrays.asList(DateFormat.getAvailableLocales());
-        diffLocale(DateFormat.class, avail);
-
-        avail = Arrays.asList(DateFormatSymbols.getAvailableLocales());
-        diffLocale(DateFormatSymbols.class, avail);
-
-        avail = Arrays.asList(DecimalFormatSymbols.getAvailableLocales());
-        diffLocale(DecimalFormatSymbols.class, avail);
-
-        avail = Arrays.asList(NumberFormat.getAvailableLocales());
-        diffLocale(NumberFormat.class, avail);
-
-        avail = Arrays.asList(Locale.getAvailableLocales());
-        diffLocale(Locale.class, avail);
+    /**
+     * This test compares the locales returned by getAvailableLocales() from a
+     * locale sensitive service to the available JDK7 locales. If the locales from
+     * a locale sensitive service are found to not contain a JDK7 available tag,
+     * the test will fail.
+     */
+    @ParameterizedTest
+    @MethodSource("serviceProvider")
+    public void compatibleLocalesTest(Class<?> c, List<Locale> locs) {
+        diffLocale(c, locs);
     }
 
     static void diffLocale(Class<?> c, List<Locale> locs) {
@@ -119,4 +113,16 @@ static void diffLocale(Class<?> c, List<Locale> locs) {
             throw new RuntimeException("Above locale(s) were not included in the target available locales");
         }
     }
+
+    private static Stream<Arguments> serviceProvider() {
+        return Stream.of(
+                Arguments.of(BreakIterator.class, Arrays.asList(BreakIterator.getAvailableLocales())),
+                Arguments.of(Collator.class, Arrays.asList(Collator.getAvailableLocales())),
+                Arguments.of(DateFormat.class, Arrays.asList(DateFormat.getAvailableLocales())),
+                Arguments.of(DateFormatSymbols.class, Arrays.asList(DateFormatSymbols.getAvailableLocales())),
+                Arguments.of(DecimalFormatSymbols.class, Arrays.asList(DecimalFormatSymbols.getAvailableLocales())),
+                Arguments.of(NumberFormat.class, Arrays.asList(NumberFormat.getAvailableLocales())),
+                Arguments.of(Locale.class, Arrays.asList(Locale.getAvailableLocales()))
+        );
+    }
 }
diff --git a/test/jdk/java/util/Locale/Bug8026766.java b/test/jdk/java/util/Locale/LRToString.java
similarity index 50%
rename from test/jdk/java/util/Locale/Bug8026766.java
rename to test/jdk/java/util/Locale/LRToString.java
index 630737fdf99..229507b71b3 100644
--- a/test/jdk/java/util/Locale/Bug8026766.java
+++ b/test/jdk/java/util/Locale/LRToString.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
@@ -25,21 +25,40 @@
  * @test
  * @bug 8026766
  * @summary Confirm that LanguageRange.toString() returns an expected result.
- * @run main Bug8026766
+ * @run junit LRToString
  */
 
 import java.util.Locale.LanguageRange;
+import java.util.stream.Stream;
 
-public class Bug8026766 {
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-    public static void main(String[] args) {
-        LanguageRange lr1 = new LanguageRange("ja", 1.0);
-        LanguageRange lr2 = new LanguageRange("fr", 0.0);
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-        if (!lr1.toString().equals("ja") ||
-            !lr2.toString().equals("fr;q=0.0")) {
-            throw new RuntimeException("LanguageRange.toString() returned an unexpected result.");
-        }
+public class LRToString {
+
+    /**
+     * This test ensures that the output of LanguageRange.toString()
+     * returns an expected result, that is, the weight is hidden if it is
+     * equal to 1.0.
+     */
+    @ParameterizedTest
+    @MethodSource("ranges")
+    public void toStringTest(String range, double weight) {
+        LanguageRange lr = new LanguageRange(range, weight);
+        String expected = weight == 1.0
+                ? range
+                : range+";q="+weight;
+        assertEquals(lr.toString(), expected);
     }
 
+    private static Stream<Arguments> ranges() {
+        return Stream.of(
+                Arguments.of("ja", 1.0),
+                Arguments.of("de", 0.5),
+                Arguments.of("fr", 0.0)
+        );
+    }
 }
diff --git a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
index 009be2ad847..dc792f9f72a 100644
--- a/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
+++ b/test/jdk/java/util/Locale/LanguageSubtagRegistryTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8040211 8191404 8203872 8222980 8225435 8241082 8242010 8247432
+ * @bug 8025703 8040211 8191404 8203872 8222980 8225435 8241082 8242010 8247432
  *      8258795 8267038 8287180 8302512 8304761 8306031 8308021
  * @summary Checks the IANA language subtag registry data update
  *          (LSR Revision: 2023-05-11) with Locale and Locale.LanguageRange
@@ -45,9 +45,9 @@ public class LanguageSubtagRegistryTest {
 
     private static final String ACCEPT_LANGUAGE =
         "Accept-Language: aam, adp, aeb, ajs, aog, apc, ajp, aue, bcg, bic, bpp, cey, cbr, cnp, cqu, crr, csp, csx, dif, dmw, dsz, ehs, ema,"
-        + " en-gb-oed, gti, iba, jks, kdz, kjh, kmb, koj, kru, ksp, kwq, kxe, kzk, lgs, lii, lmm, lsb, lsc, lsn, lsv, lsw, lvi, mtm,"
-        + " ngv, nns, ola, oyb, pat, phr, plu, pnd, pub, rib, rnb, rsn, scv, snz, sqx, suj, szy, taj, tdg, tjj, tjp, tpn, tvx,"
-        + " umi, uss, uth, ysm, zko, wkr;q=0.9, ar-hyw;q=0.8, yug;q=0.5, gfx;q=0.4";
+        + " en-gb-oed, gti, iba, ilw, jks, kdz, kjh, kmb, koj, kru, ksp, kwq, kxe, kzk, lgs, lii, lmm, lsb, lsc, lsn, lsv, lsw, lvi, meg, mtm,"
+        + " ngv, nns, ola, oyb, pat, pcr, phr, plu, pnd, pub, rib, rnb, rsn, scv, snz, sqx, suj, szy, taj, tdg, tjj, tjp, tpn, tvx,"
+        + " umi, uss, uth, xia, yos, ysm, zko, wkr;q=0.9, ar-hyw;q=0.8, yug;q=0.5, gfx;q=0.4";
     private static final List<LanguageRange> EXPECTED_RANGE_LIST = List.of(
             new LanguageRange("aam", 1.0),
             new LanguageRange("aas", 1.0),
@@ -102,6 +102,8 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("iba", 1.0),
             new LanguageRange("snb", 1.0),
             new LanguageRange("blg", 1.0),
+            new LanguageRange("ilw", 1.0),
+            new LanguageRange("gal", 1.0),
             new LanguageRange("jks", 1.0),
             new LanguageRange("sgn-jks", 1.0),
             new LanguageRange("kdz", 1.0),
@@ -140,6 +142,8 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("lsw", 1.0),
             new LanguageRange("sgn-lsw", 1.0),
             new LanguageRange("lvi", 1.0),
+            new LanguageRange("meg", 1.0),
+            new LanguageRange("cir", 1.0),
             new LanguageRange("mtm", 1.0),
             new LanguageRange("ymt", 1.0),
             new LanguageRange("ngv", 1.0),
@@ -154,6 +158,8 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("jeg", 1.0),
             new LanguageRange("pat", 1.0),
             new LanguageRange("kxr", 1.0),
+            new LanguageRange("pcr", 1.0),
+            new LanguageRange("adx", 1.0),
             new LanguageRange("phr", 1.0),
             new LanguageRange("pmu", 1.0),
             new LanguageRange("plu", 1.0),
@@ -188,6 +194,10 @@ public class LanguageSubtagRegistryTest {
             new LanguageRange("szd", 1.0),
             new LanguageRange("uss", 1.0),
             new LanguageRange("uth", 1.0),
+            new LanguageRange("xia", 1.0),
+            new LanguageRange("acn", 1.0),
+            new LanguageRange("yos", 1.0),
+            new LanguageRange("zom", 1.0),
             new LanguageRange("ysm", 1.0),
             new LanguageRange("sgn-ysm", 1.0),
             new LanguageRange("zko", 1.0),
diff --git a/test/jdk/java/util/Locale/PreserveTagCase.java b/test/jdk/java/util/Locale/PreserveTagCase.java
new file mode 100644
index 00000000000..c5535e3a89f
--- /dev/null
+++ b/test/jdk/java/util/Locale/PreserveTagCase.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2017, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8032842 8175539
+ * @summary Checks that the filterTags() and lookup() methods
+ *          preserve the case of matching language tag(s).
+ *          Before 8032842 fix these methods return the matching
+ *          language tag(s) in lowercase.
+ *          Also, checks the filterTags() to return only unique
+ *          (ignoring case considerations) matching tags.
+ * @run junit PreserveTagCase
+ */
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Locale.FilteringMode;
+import java.util.Locale.LanguageRange;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class PreserveTagCase {
+
+    /**
+     * This test ensures that Locale.filterTags() preserves the case of matching
+     * language tag(s).
+     */
+    @ParameterizedTest
+    @MethodSource("filterProvider")
+    public static void testFilterTags(String ranges, List<String> tags,
+                                  List<String> expected, FilteringMode mode) {
+        List<LanguageRange> priorityList = LanguageRange.parse(ranges);
+        List<String> actual = Locale.filterTags(priorityList, tags, mode);
+        assertEquals(actual, expected, String.format("[filterTags() failed for " +
+                "the language range: %s, Expected: %s, Found: %s]", ranges, expected, actual));
+    }
+
+    /**
+     * This test ensures that Locale.lookupTag() preserves the case of matching
+     * language tag(s).
+     */
+    @ParameterizedTest
+    @MethodSource("lookupProvider")
+    public static void testLookupTag(String ranges, List<String> tags,
+                                  String expected) {
+        List<LanguageRange> priorityList = LanguageRange.parse(ranges);
+        String actual = Locale.lookupTag(priorityList, tags);
+        assertEquals(actual, expected, String.format("[lookupTags() failed for " +
+                "the language range: %s, Expected: %s, Found: %s]", ranges, expected, actual));
+    }
+
+    private static Stream<Arguments> filterProvider() {
+        return Stream.of(
+                // test filterBasic() for preserving the case of matching tags for
+                // the language range '*', with no duplicates in the matching tags
+                Arguments.of("*",
+                        List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP", "en-GB"),
+                        List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
+                        FilteringMode.AUTOSELECT_FILTERING),
+                // test filterBasic() for preserving the case of matching tags for
+                // basic ranges other than *, with no duplicates in the matching tags
+                Arguments.of("mtm-RU, en-GB",
+                        List.of("En-Gb", "mTm-RU", "en-US", "en-latn", "en-GB"),
+                        List.of("mTm-RU", "En-Gb"),
+                        FilteringMode.AUTOSELECT_FILTERING),
+                // test filterExtended() for preserving the case of matching tags for
+                // the language range '*', with no duplicates in the matching tags
+                Arguments.of("*",
+                        List.of("de-CH", "hi-in", "En-GB", "hi-IN", "ja-Latn-JP", "JA-JP"),
+                        List.of("de-CH", "hi-in", "En-GB", "ja-Latn-JP", "JA-JP"),
+                        FilteringMode.EXTENDED_FILTERING),
+                // test filterExtended() for preserving the case of matching tags for
+                // extended ranges other than *, with no duplicates in the matching tags
+                Arguments.of("*-ch;q=0.5, *-Latn;q=0.4",
+                        List.of("fr-CH", "de-Ch", "en-latn", "en-US", "en-Latn"),
+                        List.of("fr-CH", "de-Ch", "en-latn"),
+                        FilteringMode.EXTENDED_FILTERING)
+        );
+    }
+
+    private static Stream<Arguments> lookupProvider() {
+        return Stream.of(
+                // test lookupTag() for preserving the case of matching tag
+                Arguments.of("*-ch;q=0.5", List.of("en", "fR-cH"), "fR-cH"),
+                Arguments.of("*-Latn;q=0.4", List.of("en", "fR-LATn"), "fR-LATn")
+        );
+    }
+}

From 39a595dba794aaf85dd50f920ea685f73e76414b Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Mon, 6 May 2024 08:40:24 +0000
Subject: [PATCH 3/5] 8331643: [11u]: Bump GHA bootstrap JDK to 11.0.23

Reviewed-by: sgehwolf
---
 make/conf/github-actions.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index 06c0326dda3..419337a5c6e 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -29,13 +29,13 @@ GTEST_VERSION=1.8.1
 JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7
+LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.23_9.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=23e47ea7a3015be3240f21185fd902adebdcf76530757c9b482c7eb5bd3417c2
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jdk_x64_windows_hotspot_11.0.18_10.zip
-WINDOWS_X64_BOOT_JDK_SHA256=0cfa5991a8e372b3f8eacacbb2a336663ead0cc6ec9c9ab6cd53206602fb0062
+WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_windows_hotspot_11.0.23_9.zip
+WINDOWS_X64_BOOT_JDK_SHA256=d7a9f8ceee9a5785dcbbcbec20a07b1366efec59ba652ef7e03f6f7d10f52b85
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.18_10.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=75d79315d7265cc4b89fd9e844161ff90798bc6482ace8c1ac75f862a5b3b565
+MACOS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.23%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.23_9.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=4dbd21d9a0311d321f5886eda50c3086026ed61d02e1a85f7b8c2e9ad557bf03

From 2a18cbfb8cd1e8bf90957bfd31eddbf4cace4a14 Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Tue, 7 May 2024 08:38:12 +0000
Subject: [PATCH 4/5] 8293563: [macos-aarch64] SA core file tests failing with
 sun.jvm.hotspot.oops.UnknownOopException

Reviewed-by: mbaesken
Backport-of: 5eeb41a7294f56bc258a154c043bc540cb8de5c4
---
 test/hotspot/jtreg/ProblemList.txt                   |  6 +++---
 .../jtreg/serviceability/sa/ClhsdbCDSCore.java       |  3 ++-
 .../jtreg/serviceability/sa/ClhsdbFindPC.java        |  4 ++--
 test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java |  5 +++--
 .../jtreg/serviceability/sa/ClhsdbPstack.java        |  5 +++--
 .../jtreg/serviceability/sa/TestJmapCore.java        |  3 ++-
 test/lib/jdk/test/lib/util/CoreUtils.java            | 12 +++++++++++-
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index c6db3fc6786..73b6f649078 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -174,7 +174,7 @@ serviceability/sa/ClhsdbJdis.java 8193639 solaris-all
 serviceability/sa/ClhsdbJhisto.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
 serviceability/sa/ClhsdbJstack.java 8193639 solaris-all
 serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all
-serviceability/sa/ClhsdbPmap.java 8269982,8294316,8193639,8211767,8267433 solaris-all,linux-ppc64le,linux-ppc64,macosx-aarch64,macosx-x64
+serviceability/sa/ClhsdbPmap.java 8294316,8193639,8211767,8267433 solaris-all,linux-ppc64le,linux-ppc64,macosx-x64
 serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all
 serviceability/sa/ClhsdbPrintAs.java 8193639 solaris-all
 serviceability/sa/ClhsdbPrintStatics.java 8193639 solaris-all
@@ -202,8 +202,8 @@ serviceability/sa/TestInstanceKlassSize.java 8193639 solaris-all
 serviceability/sa/TestInstanceKlassSizeForInterface.java 8193639 solaris-all
 serviceability/sa/TestIntConstant.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64
 serviceability/sa/TestJhsdbJstackLock.java 8193639 solaris-all
-serviceability/sa/TestJmapCore.java 8269982,8294316,8193639,8267433 solaris-all,macosx-aarch64,macosx-x64
-serviceability/sa/TestJmapCoreMetaspace.java 8269982,8294316,8193639,8267433 solaris-all,macosx-aarch64,macosx-x64
+serviceability/sa/TestJmapCore.java 8294316,8193639,8267433 solaris-all,macosx-x64
+serviceability/sa/TestJmapCoreMetaspace.java 8294316,8193639,8267433 solaris-all,macosx-x64
 serviceability/sa/TestPrintMdo.java 8193639 solaris-all
 serviceability/sa/TestRevPtrsForInvokeDynamic.java 8191270 generic-all
 serviceability/sa/TestType.java 8193639 solaris-all
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
index 180c241632a..9f479171ed8 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -79,6 +79,7 @@ public static void main(String[] args) throws Exception {
                 "-Xshare:auto",
                 "-XX:+ProfileInterpreter",
                 "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED",
+                CoreUtils.getAlwaysPretouchArg(true),
                 CrashApp.class.getName()
             };
 
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
index 05d89ffbfd6..5a31a74eed1 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java
@@ -85,9 +85,9 @@ private static void testFindPC(boolean withXcomp, boolean withCore) throws Excep
             theApp = new LingeredAppWithTrivialMain();
             theApp.setForceCrash(withCore);
             if (withXcomp) {
-                LingeredApp.startApp(List.of("-Xcomp"), theApp);
+                LingeredApp.startApp(List.of("-Xcomp", CoreUtils.getAlwaysPretouchArg(withCore)), theApp);
             } else {
-                LingeredApp.startApp(List.of("-Xint"), theApp);
+                LingeredApp.startApp(List.of("-Xint", CoreUtils.getAlwaysPretouchArg(withCore)), theApp);
             }
             System.out.print("Started LingeredApp ");
             if (withXcomp) {
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
index ecd5267cdc5..188021480d5 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPmap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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,6 +26,7 @@
 import java.util.Map;
 
 import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.util.CoreUtils;
 import jtreg.SkippedException;
 
 /**
@@ -46,7 +47,7 @@ public static void main(String[] args) throws Exception {
         LingeredApp theApp = null;
         try {
             ClhsdbLauncher test = new ClhsdbLauncher();
-            theApp = LingeredApp.startApp();
+            theApp = LingeredApp.startApp(List.of(CoreUtils.getAlwaysPretouchArg(false)));
             System.out.println("Started LingeredApp with pid " + theApp.getPid());
 
             List<String> cmds = List.of("pmap");
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
index 93707edfa9d..934203cda95 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPstack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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,6 +26,7 @@
 import java.util.Map;
 
 import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.util.CoreUtils;
 import jtreg.SkippedException;
 
 /**
@@ -45,7 +46,7 @@ public static void main(String[] args) throws Exception {
         LingeredApp theApp = null;
         try {
             ClhsdbLauncher test = new ClhsdbLauncher();
-            theApp = LingeredApp.startApp();
+            theApp = LingeredApp.startApp(List.of(CoreUtils.getAlwaysPretouchArg(false)));
             System.out.println("Started LingeredApp with pid " + theApp.getPid());
 
             List<String> cmds = List.of("pstack -v");
diff --git a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
index 8e0fd4afcae..71caa9ab1b5 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestJmapCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -74,6 +74,7 @@ static void test(String type) throws Throwable {
                 "-Xmx512m", "-XX:MaxMetaspaceSize=64m", "-XX:+CrashOnOutOfMemoryError", "-XX:-TransmitErrorReport",
                 // The test loads lots of small classes to exhaust Metaspace, skip method
                 // dependency verification to improve performance in debug builds.
+                CoreUtils.getAlwaysPretouchArg(true),
                 Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "--show-version",
                 TestJmapCore.class.getName(), type);
 
diff --git a/test/lib/jdk/test/lib/util/CoreUtils.java b/test/lib/jdk/test/lib/util/CoreUtils.java
index 100b19e61f6..432115746af 100644
--- a/test/lib/jdk/test/lib/util/CoreUtils.java
+++ b/test/lib/jdk/test/lib/util/CoreUtils.java
@@ -230,4 +230,14 @@ private static void unzipCores(File dir) {
         }
     }
 
-}
\ No newline at end of file
+    public static String getAlwaysPretouchArg(boolean withCore) {
+        // macosx-aarch64 has an issue where sometimes the java heap will not be dumped to the
+        // core file. Using -XX:+AlwaysPreTouch fixes the problem.
+        if (withCore && Platform.isOSX() && Platform.isAArch64()) {
+            return "-XX:+AlwaysPreTouch";
+        } else {
+            return "-XX:-AlwaysPreTouch";
+        }
+    }
+
+}

From 7fe908ba0e4c947eab25ca00e4e693e688f4ec6b Mon Sep 17 00:00:00 2001
From: Christoph Langer <clanger@openjdk.org>
Date: Tue, 7 May 2024 08:42:00 +0000
Subject: [PATCH 5/5] 8325579: Inconsistent behavior in
 com.sun.jndi.ldap.Connection::createSocket

Reviewed-by: mbaesken
Backport-of: 32bf1f4169fd07291d608323c143832ad48e531e
---
 .../classes/com/sun/jndi/ldap/Connection.java |  51 ++--
 .../share/classes/module-info.java            |  24 +-
 .../ldap/LdapSSLHandshakeFailureTest.java     | 253 ++++++++++++------
 3 files changed, 212 insertions(+), 116 deletions(-)

diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java b/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
index 2461527acc2..39f5b6cb82e 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -120,17 +120,15 @@
 public final class Connection implements Runnable {
 
     private static final boolean debug = false;
-    private static final int dump = 0; // > 0 r, > 1 rw
-
 
     final private Thread worker;    // Initialized in constructor
 
-    private boolean v3 = true;       // Set in setV3()
+    private boolean v3 = true;     // Set in setV3()
 
-    final public String host;  // used by LdapClient for generating exception messages
-                         // used by StartTlsResponse when creating an SSL socket
-    final public int port;     // used by LdapClient for generating exception messages
-                         // used by StartTlsResponse when creating an SSL socket
+    public final String host;  // used by LdapClient for generating exception messages
+                               // used by StartTlsResponse when creating an SSL socket
+    public final int port;     // used by LdapClient for generating exception messages
+                               // used by StartTlsResponse when creating an SSL socket
 
     private boolean bound = false;   // Set in setBound()
 
@@ -319,30 +317,37 @@ private SocketFactory getSocketFactory(String socketFactoryName) throws Exceptio
     }
 
     private Socket createConnectionSocket(String host, int port, SocketFactory factory,
-                                          int connectTimeout) throws Exception {
+                                          int connectTimeout) throws IOException {
         Socket socket = null;
 
+        // if timeout is supplied, try to use unconnected socket for connecting with timeout
         if (connectTimeout > 0) {
-            // create unconnected socket and then connect it if timeout
-            // is supplied
-            InetSocketAddress endpoint =
-                    createInetSocketAddress(host, port);
-            // unconnected socket
-            socket = factory.createSocket();
-            // connect socket with a timeout
-            socket.connect(endpoint, connectTimeout);
             if (debug) {
-                System.err.println("Connection: creating socket with " +
-                        "a connect timeout");
+                System.err.println("Connection: creating socket with a connect timeout");
+            }
+            try {
+                // unconnected socket
+                socket = factory.createSocket();
+            } catch (IOException e) {
+                // unconnected socket is likely not supported by the SocketFactory
+                if (debug) {
+                    System.err.println("Connection: unconnected socket not supported by SocketFactory");
+                }
+            }
+            if (socket != null) {
+                InetSocketAddress endpoint = createInetSocketAddress(host, port);
+                // connect socket with a timeout
+                socket.connect(endpoint, connectTimeout);
             }
         }
+
+        // either no timeout was supplied or unconnected socket did not work
         if (socket == null) {
             // create connected socket
-            socket = factory.createSocket(host, port);
             if (debug) {
-                System.err.println("Connection: creating connected socket with" +
-                        " no connect timeout");
+                System.err.println("Connection: creating connected socket with no connect timeout");
             }
+            socket = factory.createSocket(host, port);
         }
         return socket;
     }
@@ -351,7 +356,7 @@ private Socket createConnectionSocket(String host, int port, SocketFactory facto
     // the SSL handshake following socket connection as part of the timeout.
     // So explicitly set a socket read timeout, trigger the SSL handshake,
     // then reset the timeout.
-    private void initialSSLHandshake(SSLSocket sslSocket , int connectTimeout) throws Exception {
+    private void initialSSLHandshake(SSLSocket sslSocket, int connectTimeout) throws Exception {
 
             if (!IS_HOSTNAME_VERIFICATION_DISABLED) {
                 SSLParameters param = sslSocket.getSSLParameters();
diff --git a/src/java.naming/share/classes/module-info.java b/src/java.naming/share/classes/module-info.java
index f9d0b50ff38..112ec8e7a41 100644
--- a/src/java.naming/share/classes/module-info.java
+++ b/src/java.naming/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2024, 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
@@ -36,21 +36,33 @@
  * The following implementation specific properties are supported by the
  * default LDAP Naming Service Provider implementation in the JDK:
  * <ul>
+ *     <li>{@code java.naming.ldap.factory.socket}:
+ *         <br>The value of this environment property specifies the fully
+ *         qualified class name of the socket factory used by the LDAP provider.
+ *         This class must implement the {@link javax.net.SocketFactory} abstract class
+ *         and provide an implementation of the static "getDefault()" method that
+ *         returns an instance of the socket factory. By default the environment
+ *         property is not set.
+ *     </li>
  *     <li>{@code com.sun.jndi.ldap.connect.timeout}:
- *         <br>The value of this property is the string representation
- *         of an integer representing the connection timeout in
- *         milliseconds. If the LDAP provider cannot establish a
- *         connection within that period, it aborts the connection attempt.
+ *         <br>The value of this environment property is the string representation
+ *         of an integer specifying the connection timeout in milliseconds.
+ *         If the LDAP provider cannot establish a connection within that period,
+ *         it aborts the connection attempt.
  *         The integer should be greater than zero. An integer less than
  *         or equal to zero means to use the network protocol's (i.e., TCP's)
  *         timeout value.
  *         <br> If this property is not specified, the default is to wait
  *         for the connection to be established or until the underlying
  *         network times out.
+ *         <br> If a custom socket factory is provided via environment property
+ *         {@code java.naming.ldap.factory.socket} and unconnected sockets
+ *         are not supported, the specified timeout is ignored
+ *         and the provider behaves as if no connection timeout was set.
  *     </li>
  *     <li>{@code com.sun.jndi.ldap.read.timeout}:
  *         <br>The value of this property is the string representation
- *         of an integer representing the read timeout in milliseconds
+ *         of an integer specifying the read timeout in milliseconds
  *         for LDAP operations. If the LDAP provider cannot get a LDAP
  *         response within that period, it aborts the read attempt. The
  *         integer should be greater than zero. An integer less than or
diff --git a/test/jdk/com/sun/jndi/ldap/LdapSSLHandshakeFailureTest.java b/test/jdk/com/sun/jndi/ldap/LdapSSLHandshakeFailureTest.java
index 766862d2670..15d8f8b074c 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapSSLHandshakeFailureTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapSSLHandshakeFailureTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -21,68 +21,117 @@
  * questions.
  */
 
-import jdk.test.lib.net.URIBuilder;
-
-import javax.naming.Context;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Field;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.util.Hashtable;
 
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
+
+import jdk.test.lib.net.URIBuilder;
+
 /*
  * @test
- * @bug 8314063
+ * @bug 8314063 8325579
  * @library /test/lib
- * @summary For LDAPs connection, if the value of com.sun.jndi.ldap.connect.timeout is
- * set too small or not an optimal value for the system, after the socket is created and
- * connected to the server, but the handshake between the client and server fails due to
- * socket time out, the opened socket is not closed properly. In this test case, the server
- * is forced to sleep ten seconds and connection time out for client is one second. This
- * will allow the socket opened and connected, and give the chance for the handshake to be
- * timed out. Before this fix, the socket is kept opened. Right now the exception will be
- * caught and the socket will be closed.
+ * @summary Several scenarios for LDAP connection handshaking are tested here.
+ * We test different combinations of com.sun.jndi.ldap.connect.timeout values
+ * and server behavior, e.g. a server that replies immediately vs a server that
+ * delays the initial answer. We also try to check whether the underlying Socket
+ * object will be closed correctly.
+ * We expect exceptions when using a custom SocketFactory that does not supply
+ * SSL Sockets. In that case we instrument the supplied Socket object and check
+ * if it was properly closed after the handshake failure.
+ * When the value of com.sun.jndi.ldap.connect.timeout is set lower than the
+ * server delay, we also expect an exception.
+ * In all other cases a valid Context object shall be returned and we check
+ * whether the socket is closed after closing the Context.
  *
- * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactory true 6000
- * @run main/othervm LdapSSLHandshakeFailureTest -1000 true 6000
- * @run main/othervm LdapSSLHandshakeFailureTest -1000 false 6000
- * @run main/othervm LdapSSLHandshakeFailureTest 2000 false 6000
- * @run main/othervm LdapSSLHandshakeFailureTest 0 true 6000
- * @run main/othervm LdapSSLHandshakeFailureTest 0 false 6000
+ * @modules java.naming/javax.naming:+open java.naming/com.sun.jndi.ldap:+open
+ * @run main/othervm LdapSSLHandshakeFailureTest
  * @run main/othervm LdapSSLHandshakeFailureTest true
- * @run main/othervm LdapSSLHandshakeFailureTest false
+ * @run main/othervm LdapSSLHandshakeFailureTest 0
+ * @run main/othervm LdapSSLHandshakeFailureTest 0 true
+ * @run main/othervm LdapSSLHandshakeFailureTest 2000
+ * @run main/othervm LdapSSLHandshakeFailureTest 2000 true
+ * @run main/othervm LdapSSLHandshakeFailureTest -1000
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactoryNoUnconnected
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactoryNoUnconnected 1000
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactoryNoUnconnected true
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactoryNoUnconnected 1000 true
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactory
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactory 1000
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactory true
+ * @run main/othervm LdapSSLHandshakeFailureTest LdapSSLHandshakeFailureTest$CustomSocketFactory 1000 true
  */
 
 public class LdapSSLHandshakeFailureTest {
-    private static String SOCKET_CLOSED_MSG = "The socket has been closed.";
+    private static int SERVER_SLEEPING_TIME = 4000;
+    private static String progArgs[];
+    private static int curArg;
+    private static String customSocketFactory;
+    private static Integer connectTimeout;
+    private static boolean serverSlowDown;
+
+    private static String popArg() {
+        if (curArg >= progArgs.length) {
+            return null;
+        }
+        return progArgs[curArg++];
+    }
 
-    private static int serverSleepingTime = 5000;
+    private static void parseArgs(String args[]) {
+        progArgs = args;
+        curArg = 0;
 
-    public static void main(String args[]) throws Exception {
+        String arg = popArg();
+        if (arg == null)
+            return;
 
-        // Set the keystores
-        setKeyStore();
-        boolean serverSlowDown = Boolean.valueOf(args[0]);
-        if (args.length == 2) {
-            serverSlowDown = Boolean.valueOf(args[1]);
+        if (arg.startsWith("LdapSSLHandshakeFailureTest$CustomSocketFactory")) {
+            customSocketFactory = arg;
+            arg = popArg();
+            if (arg == null)
+                return;
         }
 
-        if (args.length == 3) {
-            serverSleepingTime = Integer.valueOf(args[2]);
+        try {
+            connectTimeout = Integer.valueOf(arg);
+            arg = popArg();
+            if (arg == null)
+                return;
+        } catch (NumberFormatException e) {
+            // then it must be the boolean arg for serverSlowDown
         }
 
-        boolean hasCustomSocketFactory = args[0]
-                .equals("LdapSSLHandshakeFailureTest$CustomSocketFactory");
+        serverSlowDown = Boolean.valueOf(arg);
+    }
+
+    public static void main(String args[]) {
+        parseArgs(args);
+
+        System.out.println("Testing " +
+            (customSocketFactory == null ? "without custom SocketFactory" : "with custom SocketFactory \"" + customSocketFactory + "\"") +
+            ", " + (connectTimeout == null ? "no connectTimeout" : "connectTimeout=" + connectTimeout + "") +
+            ", serverSlowDown=" + serverSlowDown);
+
+        // Set the keystores
+        setKeyStore();
+
         // start the test server first.
-        try (TestServer server = new TestServer(serverSlowDown, serverSleepingTime)) {
+        try (TestServer server = new TestServer(serverSlowDown)) {
             server.start();
             Hashtable<String, Object> env = new Hashtable<>();
             env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
@@ -93,15 +142,13 @@ public static void main(String args[]) throws Exception {
                     .port(server.getPortNumber())
                     .buildUnchecked().toString());
 
-            if (hasCustomSocketFactory) {
-                env.put("java.naming.ldap.factory.socket", args[0]);
-                env.put("com.sun.jndi.ldap.connect.timeout", "1000");
+            if (customSocketFactory != null) {
+                env.put("java.naming.ldap.factory.socket", customSocketFactory);
             }
 
-            if (args.length == 2 && !hasCustomSocketFactory) {
-                env.put("com.sun.jndi.ldap.connect.timeout", args[0]);
+            if (connectTimeout != null) {
+                env.put("com.sun.jndi.ldap.connect.timeout", connectTimeout.toString());
             }
-
             env.put(Context.SECURITY_PROTOCOL, "ssl");
             env.put(Context.SECURITY_AUTHENTICATION, "Simple");
             env.put(Context.SECURITY_PRINCIPAL, "cn=principal");
@@ -109,94 +156,127 @@ public static void main(String args[]) throws Exception {
             LdapContext ctx = null;
             try {
                 ctx = new InitialLdapContext(env, null);
-            } catch (Exception e) {
-                if (CustomSocketFactory.customSocket.closeMethodCalledCount() > 0
-                        && hasCustomSocketFactory
-                        && Boolean.valueOf(args[1])) {
-                    System.out.println(SOCKET_CLOSED_MSG);
+            } catch (NamingException e) {
+                if (customSocketFactory != null) {
+                    System.out.println("Caught expected Exception with custom SocketFactory (no SSL Socket).");
+                    if (CustomSocketFactory.customSocket.closeMethodCalledCount() <= 0) {
+                        throw new RuntimeException("Custom Socket was not closed.");
+                    }
+                } else if (connectTimeout > 0) {
+                    System.out.println("Caught expected Exception with connectTimeout > 0.");
                 } else {
                     throw e;
                 }
             } finally {
-                if (ctx != null)
+                if (ctx != null) {
+                    System.out.println("Context was created, closing it.");
+                    Socket sock = getSocket(ctx);
                     ctx.close();
+                    if (!sock.isClosed()) {
+                        throw new RuntimeException("Socket isn't closed");
+                    }
+                }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
-    public static class CustomSocketFactory extends SocketFactory {
-        private static CustomSocket customSocket;
+    private static Socket getSocket(LdapContext ctx) throws Exception {
+        Field defaultInitCtxField = ctx.getClass().getSuperclass().getSuperclass().getDeclaredField("defaultInitCtx");
+        defaultInitCtxField.setAccessible(true);
+        Object defaultInitCtx = defaultInitCtxField.get(ctx);
+        Field clntField = defaultInitCtx.getClass().getDeclaredField("clnt");
+        clntField.setAccessible(true);
+        Object clnt = clntField.get(defaultInitCtx);
+        Field connField = clnt.getClass().getDeclaredField("conn");
+        connField.setAccessible(true);
+        Object conn = connField.get(clnt);
+        return (Socket)conn.getClass().getDeclaredField("sock").get(conn);
+    }
 
-        public static CustomSocketFactory getDefault() {
-            return new CustomSocketFactory();
+    private static class CustomSocket extends Socket {
+        private int closeMethodCalled;
+
+        public CustomSocket() {
+            super();
         }
 
-        @Override
-        public Socket createSocket() throws SocketException {
-            customSocket = new CustomSocket();
-            return customSocket;
+        public CustomSocket(String s, int port) throws IOException {
+            super(s, port);
         }
 
-        @Override
-        public Socket createSocket(String s, int timeout) {
-            return customSocket;
+        public int closeMethodCalledCount() {
+            return closeMethodCalled;
         }
 
         @Override
-        public Socket createSocket(String host, int port, InetAddress localHost,
-                                   int localPort) {
-            return customSocket;
+        public void close() throws java.io.IOException {
+            closeMethodCalled++;
+            super.close();
+        }
+    }
+
+    public static class CustomSocketFactoryNoUnconnected extends SocketFactory {
+        static CustomSocket customSocket;
+
+        public static SocketFactory getDefault() {
+            return new CustomSocketFactoryNoUnconnected();
         }
 
         @Override
-        public Socket createSocket(InetAddress host, int port) {
+        public Socket createSocket(String s, int port) throws IOException {
+            customSocket = new CustomSocket(s, port);
             return customSocket;
         }
 
         @Override
-        public Socket createSocket(InetAddress address, int port,
-                                   InetAddress localAddress, int localPort) {
-            return customSocket;
+        public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
+                throws IOException, UnknownHostException {
+            return null;
         }
-    }
 
-    private static class CustomSocket extends Socket {
-        private int closeMethodCalled = 0;
+        @Override
+        public Socket createSocket(InetAddress host, int port) throws IOException {
+            return null;
+        }
 
-        public CustomSocket() {
-            closeMethodCalled = 0;
+        @Override
+        public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
+                throws IOException {
+            return null;
         }
+    }
 
-        public int closeMethodCalledCount() {
-            return closeMethodCalled;
+    public static class CustomSocketFactory extends CustomSocketFactoryNoUnconnected {
+        public static SocketFactory getDefault() {
+            return new CustomSocketFactory();
         }
 
         @Override
-        public void close() throws java.io.IOException {
-            closeMethodCalled++;
-            super.close();
+        public Socket createSocket() throws SocketException {
+            customSocket = new CustomSocket();
+            return customSocket;
         }
     }
 
     private static void setKeyStore() {
+        String keystore = System.getProperty("test.src", ".") + File.separator + "ksWithSAN";
 
-        String fileName = "ksWithSAN", dir = System.getProperty("test.src", ".") + File.separator;
-
-        System.setProperty("javax.net.ssl.keyStore", dir + fileName);
+        System.setProperty("javax.net.ssl.keyStore", keystore);
         System.setProperty("javax.net.ssl.keyStorePassword", "welcome1");
-        System.setProperty("javax.net.ssl.trustStore", dir + fileName);
+        System.setProperty("javax.net.ssl.trustStore", keystore);
         System.setProperty("javax.net.ssl.trustStorePassword", "welcome1");
     }
 
     static class TestServer extends Thread implements AutoCloseable {
         private boolean isForceToSleep;
-        private int sleepingTime;
         private final ServerSocket serverSocket;
         private final int PORT;
 
-        private TestServer(boolean isForceToSleep, int sleepingTime) {
+        private TestServer(boolean isForceToSleep) {
             this.isForceToSleep = isForceToSleep;
-            this.sleepingTime = sleepingTime;
             try {
                 SSLServerSocketFactory socketFactory = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();
                 serverSocket = socketFactory.createServerSocket(0, 0, InetAddress.getLoopbackAddress());
@@ -217,7 +297,7 @@ public void run() {
                  InputStream in = socket.getInputStream();
                  OutputStream out = socket.getOutputStream()) {
                 if (isForceToSleep) {
-                    Thread.sleep(sleepingTime);
+                    Thread.sleep(SERVER_SLEEPING_TIME);
                 }
                 byte[] bindResponse = {0x30, 0x0C, 0x02, 0x01, 0x01, 0x61, 0x07, 0x0A,
                         0x01, 0x00, 0x04, 0x00, 0x04, 0x00};
@@ -233,7 +313,7 @@ public void run() {
                     in.skip(in.available());
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                // e.printStackTrace();
             }
         }
 
@@ -245,4 +325,3 @@ public void close() throws Exception {
         }
     }
 }
-