8351435: Change the default Console implementation back to the built-in one in java.base module

src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, 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
@@ -33,7 +33,7 @@ public interface JdkConsoleProvider {
     /**
      * The module name of the JdkConsole default provider.
      */
-    String DEFAULT_PROVIDER_MODULE_NAME = "jdk.internal.le";
+    String DEFAULT_PROVIDER_MODULE_NAME = "java.base";
 
     /**
      * {@return the Console instance, or {@code null} if not available}

test/jdk/java/io/Console/ConsolePromptTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -23,68 +23,90 @@
 
 /**
  * @test
- * @bug 8331681
+ * @bug 8331681 8351435
  * @summary Verify the java.base's console provider handles the prompt correctly.
  * @library /test/lib
- * @run main/othervm --limit-modules java.base ConsolePromptTest
- * @run main/othervm -Djdk.console=java.base ConsolePromptTest
  */
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Objects;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
 
 public class ConsolePromptTest {
 
+    private static final List<List<String>> VARIANTS = List.of(
+        List.of("--limit-modules", "java.base"),
+        List.of("-Djdk.console=java.base")
+    );
+
     public static void main(String... args) throws Throwable {
         for (Method m : ConsolePromptTest.class.getDeclaredMethods()) {
             if (m.getName().startsWith("test")) {
-                m.invoke(new ConsolePromptTest());
+                for (List<String> variant : VARIANTS) {
+                    try {
+                        m.invoke(new ConsolePromptTest(variant));
+                    } catch (InvocationTargetException e) {
+                        if (e.getCause() instanceof SkippedException se) {
+                            throw se;
+                        } else {
+                            throw e;
+                        }
+                    }
+                }
             }
         }
     }
 
+    private final List<String> extraParams;
+
+    public ConsolePromptTest(List<String> extraParams) {
+        this.extraParams = extraParams;
+    }
+
     void testCorrectOutputReadLine() throws Exception {
-        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+        doRunConsoleTest("testCorrectOutputReadLine");
     }
 
     void testCorrectOutputReadPassword() throws Exception {
-        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+        doRunConsoleTest("testCorrectOutputReadPassword");
     }
 
-    void doRunConsoleTest(String testName,
-                          String input,
-                          String expectedOut) throws Exception {
-        ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
-                                                          testName);
-        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
-
-        output.waitFor();
-
-        if (output.getExitValue() != 0) {
-            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
-                                     ", actualOut: " + output.getStdout() +
-                                     ", actualErr: " + output.getStderr());
+    void doRunConsoleTest(String testName) throws Exception {
+        // check "expect" command availability
+        var expect = Paths.get("/usr/bin/expect");
+        if (!Files.exists(expect) || !Files.isExecutable(expect)) {
+            throw new SkippedException("'expect' command not found. Test ignored.");
         }
 
-        String actualOut = output.getStdout();
-
-        if (!Objects.equals(expectedOut, actualOut)) {
-            throw new AssertionError("Unexpected stdout content. " +
-                                     "Expected: '" + expectedOut + "'" +
-                                     ", got: '" + actualOut + "'");
-        }
-
-        String expectedErr = "";
-        String actualErr = output.getStderr();
-
-        if (!Objects.equals(expectedErr, actualErr)) {
-            throw new AssertionError("Unexpected stderr content. " +
-                                     "Expected: '" + expectedErr + "'" +
-                                     ", got: '" + actualErr + "'");
+        // invoking "expect" command
+        var testSrc = System.getProperty("test.src", ".");
+        var jdkDir = System.getProperty("test.jdk");
+
+        List<String> command = new ArrayList<>();
+
+        command.add("expect");
+        command.add("-n");
+        command.add(testSrc + "/consolePrompt.exp");
+        command.add("%s");
+        command.add(jdkDir + "/bin/java");
+        command.addAll(extraParams);
+        command.add("-cp");
+        command.add(System.getProperty("java.class.path"));
+        command.add(ConsoleTest.class.getName());
+        command.add(testName);
+
+        OutputAnalyzer output = ProcessTools.executeProcess(command.toArray(String[]::new));
+        output.reportDiagnosticSummary();
+        var eval = output.getExitValue();
+        if (eval != 0) {
+            throw new RuntimeException("Test failed. Exit value from 'expect' command: " + eval);
         }
     }
 

test/jdk/java/io/Console/DefaultCharsetTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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,15 +26,15 @@
 
 /**
  * @test
- * @bug 8341975
+ * @bug 8341975 8351435
  * @summary Tests the default charset. It should honor `stdout.encoding`
  *          which should be the same as System.out.charset()
  * @modules jdk.internal.le
- * @run junit/othervm -Dstdout.encoding=UTF-8 DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=US-ASCII DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=foo DefaultCharsetTest
- * @run junit/othervm DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=UTF-8 DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=US-ASCII DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=foo DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le DefaultCharsetTest
  */
 public class DefaultCharsetTest {
     @Test

test/jdk/java/io/Console/LocaleTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -31,7 +31,7 @@
 
 /**
  * @test
- * @bug 8330276
+ * @bug 8330276 8351435
  * @summary Tests Console methods that have Locale as an argument
  * @library /test/lib
  * @modules jdk.internal.le jdk.localedata
@@ -57,6 +57,7 @@ public static void main(String... args) throws Throwable {
         if (args.length == 0) {
             // no arg will launch the child process that actually perform tests
             var pb = ProcessTools.createTestJavaProcessBuilder(
+                    "-Djdk.console=jdk.internal.le",
                     "LocaleTest", "dummy");
             var input = new File(System.getProperty("test.src", "."), "input.txt");
             pb.redirectInput(input);

test/jdk/java/io/Console/ModuleSelectionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, 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
@@ -23,11 +23,11 @@
 
 /**
  * @test
- * @bug 8295803 8299689
+ * @bug 8295803 8299689 8351435
  * @summary Tests System.console() returns correct Console (or null) from the expected
  *          module.
  * @modules java.base/java.io:+open
- * @run main/othervm ModuleSelectionTest jdk.internal.le
+ * @run main/othervm ModuleSelectionTest java.base
  * @run main/othervm -Djdk.console=jdk.internal.le ModuleSelectionTest jdk.internal.le
  * @run main/othervm -Djdk.console=java.base ModuleSelectionTest java.base
  * @run main/othervm --limit-modules java.base ModuleSelectionTest java.base

test/jdk/java/io/Console/consolePrompt.exp

@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2025, 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.
+#
+
+set java [lrange $argv 1 end]
+set expected [lindex $argv 0]
+
+eval spawn $java
+expect -- "$expected"
+send -- "\n"
+expect eof

test/jdk/java/io/IO/IO.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, 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
@@ -50,9 +50,10 @@
 
 /*
  * @test
- * @bug 8305457 8342936
+ * @bug 8305457 8342936 8351435
  * @summary java.io.IO tests
  * @library /test/lib
+ * @modules jdk.internal.le
  * @run junit IO
  */
 @ExtendWith(IO.TimingExtension.class)
@@ -152,7 +153,7 @@ public void inputTestInteractive(String console, String prompt) throws Exception
 
         public static Stream<Arguments> args() {
             // cross product: consoles x prompts
-            return Stream.of(null, "gibberish").flatMap(console -> Stream.of(null, "?", "%s", PROMPT_NONE)
+            return Stream.of("jdk.internal.le", "gibberish").flatMap(console -> Stream.of(null, "?", "%s", PROMPT_NONE)
                     .map(prompt -> new String[]{console, prompt}).map(Arguments::of));
         }
     }
@@ -162,7 +163,7 @@ public static Stream<Arguments> args() {
     public void printTest(String mode) throws Exception {
         var file = Path.of(System.getProperty("test.src", "."), "Output.java")
                 .toAbsolutePath().toString();
-        var pb = ProcessTools.createTestJavaProcessBuilder("--enable-preview", file, mode);
+        var pb = ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", "--enable-preview", file, mode);
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         assertEquals(0, output.getExitValue());
         assertTrue(output.getStderr().isEmpty());
@@ -195,7 +196,7 @@ void main() {
                     }
                     """);
         }
-        var pb = ProcessTools.createTestJavaProcessBuilder("--enable-preview", file.toString());
+        var pb = ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", "--enable-preview", file.toString());
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         assertEquals(0, output.getExitValue());
         assertTrue(output.getStderr().isEmpty());

test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8331535
+ * @bug 8331535 8351435
  * @summary Verify the jdk.internal.le's console provider works properly.
  * @modules jdk.internal.le
  * @library /test/lib
@@ -58,7 +58,7 @@ void doRunConsoleTest(String testName,
                           String input,
                           String expectedOut) throws Exception {
         ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName(),
                                                           testName);
         OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
 

test/jdk/jdk/internal/jline/RedirectedStdOut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8330998
+ * @bug 8330998 8351435
  * @summary Verify that even if the stdout is redirected java.io.Console will
  *          use it for writing.
  * @modules jdk.internal.le
@@ -61,7 +61,7 @@ public static void main(String... args) throws Throwable {
     //this test is weaker, but more reliable:
     void runRedirectAllTest() throws Exception {
         ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+                ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName());
         OutputAnalyzer output = ProcessTools.executeProcess(builder);
 
         output.waitFor();
@@ -153,7 +153,7 @@ void runRedirectOutOnly() throws Throwable {
         System.setOut(new PrintStream(new ByteArrayOutputStream()));
 
         ProcessBuilder builder =
-            ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+            ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName());
 
         builder.inheritIO();
         builder.redirectOutput(stdout.toFile());