Correct test expectations of _localeTest for Java 25

The currency symbol in the Chinese mainland locale has changed.
We also bring in the Java 25 changes to build.gradle at this point,
since it runs the Java tests.

This change is cherry-picked from PR 424 with improvements.

Author: robertpatrick

build.gradle

@@ -91,6 +91,34 @@ ext {
 }
 
 
+// Collect extra arguments for the JVM in the test task
+ext.jythonTestJvmArgs = []
+
+// Explicitly provided in a property
+def extraJythonTestJavaOpts = findProperty('jython.test.java.opts')
+if (extraJythonTestJavaOpts) {
+    ext.jythonTestJvmArgs.addAll(
+        extraJythonTestJavaOpts.toString().trim().split(/\s+/).findAll { it })
+}
+
+// JVM aguments necessitated by later versions of Java
+// FIXME: Gradle 7.4.2 returns at most 21 here even on Java 25.
+// (Fix by updating Gradle: the code is correct and the warnings harmless.)
+def currentJavaMajor = JavaVersion.current().majorVersion as int
+if (currentJavaMajor >= 9) {
+    ext.jythonTestJvmArgs.addAll([
+        '--add-opens=java.base/java.io=ALL-UNNAMED',
+        '--add-opens=java.base/sun.nio.ch=ALL-UNNAMED'
+    ])
+}
+if (currentJavaMajor >= 25) {
+    ext.jythonTestJvmArgs.addAll([
+        '--enable-native-access=ALL-UNNAMED',
+        '--sun-misc-unsafe-memory-access=allow'
+    ])
+}
+
+
 repositories {
     // Jython is distributed through Maven Central. Get our dependencies there too.
     mavenCentral()
@@ -651,7 +679,8 @@ jar {
             'Main-Class': 'org.python.util.jython',
             'Built-By': 'build.gradle',
             'Automatic-Module-Name': 'org.python.jython2',
-            'Enable-Native-Access': 'ALL-UNNAMED'
+            'Enable-Native-Access': 'ALL-UNNAMED',
+            'Add-Opens': 'java.base/java.io java.base/sun.nio.ch'
         ])
 
         attributes( [ // Build-Info section
@@ -684,6 +713,8 @@ task testJar(type: Jar) {
         attributes ([
             //'Main-Class': 'org.python.util.jython',
             'Built-By': 'build.gradle',
+            'Enable-Native-Access': 'ALL-UNNAMED',
+            'Add-Opens': 'java.base/java.io java.base/sun.nio.ch'
         ])
 
         attributes( [ // Build-Info section
@@ -864,6 +895,7 @@ test {
     systemProperty 'python.cachedir', "${project.buildDir}/cachedir"
     // Logging level: default is message=INFO
     //systemProperty 'python.verbose', 'CONFIG'
+    jvmArgs project.ext.jythonTestJvmArgs
 
     include '**/*Test*'
 
@@ -890,7 +922,10 @@ test {
     exclude 'org/python/util/InterpreterTest.class'
 
     doFirst {
-        println "systemProperties = $systemProperties"
+        println " systemProperties = $systemProperties"
+        println "      JavaVersion = ${JavaVersion.current()}"
+        println "jythonTestJvmArgs = ${project.ext.jythonTestJvmArgs}"
+        println "       allJvmArgs = ${allJvmArgs}"
     }
 
 }

tests/java/org/python/modules/_locale/_localeTest.java

@@ -116,7 +116,7 @@ public void moduleImportDefault() {
 
     private static int javaMajorVersion() {
         String versionString = System.getProperty("java.runtime.version");
-        String[] javaVersionElements = versionString.split("\\.|_|-b");
+        String[] javaVersionElements = versionString.split("\\.|_|-b|-|\\+");
         int major = Integer.valueOf(javaVersionElements[0]);
         int minor = Integer.valueOf(javaVersionElements[1]);
         if (major == 1) {
@@ -281,9 +281,11 @@ public void setLocaleGerman() {
     public void setLocaleChinaMainland() {
         settableInit();
         /*
-         * Java has ¥ \uffe5 rather than 元 \u5143 for zh-CN Java has negative sign preceding, Python
-         * following.
+         * Java has ¥ rather than 元 \u5143 for zh-CN. Java has negative sign preceding, Python
+         * following. JDK 17+ returns the regular yen sign \u00a5, while older JDKs returned the
+         * full-width yen sign \uffe5.
          */
+        String currencySymbol = javaMajorVersion() >= 17 ? "\\xc2\\xa5" : "\\xef\\xbf\\xa5";
         // @formatter:off
         String script =
                   "from _locale import setlocale, localeconv\n"
@@ -295,7 +297,7 @@ public void setLocaleChinaMainland() {
                 + "'decimal_point': '.', 'int_curr_symbol': 'CNY', "
                 + "'n_cs_precedes': 1, 'p_sign_posn': 3, "
                 + "'mon_thousands_sep': ',', 'negative_sign': '-', "
-                + "'currency_symbol':  '\\xef\\xbf\\xa5' , "
+                + "'currency_symbol':  '" + currencySymbol + "' , "
                 + "'n_sep_by_space': 0, "
                 + "'p_cs_precedes': 1, 'positive_sign': ''} \n"
                 + "actual = localeconv() \n"