Tests read* method variations

Author: naotoj

test/jdk/java/io/Console/StdinEncodingTest.java

@@ -24,6 +24,7 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
+import java.io.BufferedReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -64,16 +65,29 @@ public void testStdinEncoding() throws Throwable {
             jdkDir + "/bin/java",
             "--module-path",
             testClasses + "/modules",
-            "-Dstdin.encoding=Z",
+            "-Dstdin.encoding=Mock", // <- gist of this test
             "StdinEncodingTest");
         output.reportDiagnosticSummary();
         var eval = output.getExitValue();
-        if (eval != 0) {
-            throw new RuntimeException("Test failed. Exit value from 'expect' command: " + eval);
-        }
+        assertEquals(0, eval, "Test failed. Exit value from 'expect' command: " + eval);
     }
 
     public static void main(String... args) throws Throwable {
-        System.out.println(System.console().readLine());
+        // check stdin.encoding
+        if (!"Mock".equals(System.getProperty("stdin.encoding"))) {
+            throw new RuntimeException("Mock charset was not set in stdin.encoding");
+        }
+        var con = System.console();
+
+        // Console.readLine()
+        System.out.print(con.readLine());
+
+        // Console.readPassword()
+        System.out.print(String.valueOf(con.readPassword()));
+
+        // Console.reader()
+        try (var br = new BufferedReader(con.reader())) {
+            System.out.print(br.readLine());
+        }
     }
 }

test/jdk/java/io/Console/csp/module-info.java

@@ -22,5 +22,5 @@
  */
 
 module csp {
-    provides java.nio.charset.spi.CharsetProvider with provider.ZCharsetProvider;
+    provides java.nio.charset.spi.CharsetProvider with provider.MockCharsetProvider;
 }

test/jdk/java/io/Console/csp/provider/ZCharsetProvider.java renamed to test/jdk/java/io/Console/csp/provider/MockCharsetProvider.java

@@ -32,27 +32,27 @@
 import java.util.Collections;
 import java.util.Iterator;
 
-// A test charset provider that decodes every input byte into Z
-public class ZCharsetProvider extends CharsetProvider {
+// A test charset provider that decodes every input byte into its uppercase
+public class MockCharsetProvider extends CharsetProvider {
 
     @Override
     public Iterator charsets() {
-        return Collections.singleton(new ZCharsetProvider.ZCharset()).iterator();
+        return Collections.singleton(new MockCharsetProvider.MockCharset()).iterator();
     }
 
     @Override
     public Charset charsetForName(String charsetName) {
-        if (charsetName.equals("Z")) {
-            return new ZCharsetProvider.ZCharset();
+        if (charsetName.equals("Mock")) {
+            return new MockCharsetProvider.MockCharset();
         } else {
             return null;
         }
     }
 
-    public static class ZCharset extends Charset {
+    public static class MockCharset extends Charset {
 
-        public ZCharset() {
-            super("Z", null);
+        public MockCharset() {
+            super("Mock", null);
         }
 
         @Override
@@ -62,7 +62,7 @@ public boolean contains(Charset cs) {
 
         @Override
         public CharsetDecoder newDecoder() {
-            return new ZCharsetDecoder(this, 1, 1);
+            return new MockCharsetDecoder(this, 1, 1);
         }
 
         @Override
@@ -71,16 +71,18 @@ public CharsetEncoder newEncoder() {
         }
     }
 
-    private static class ZCharsetDecoder extends CharsetDecoder {
-        public ZCharsetDecoder(Charset cs, float averageCharsPerByte, float maxCharsPerByte) {
+    private static class MockCharsetDecoder extends CharsetDecoder {
+        public MockCharsetDecoder(Charset cs, float averageCharsPerByte, float maxCharsPerByte) {
             super(cs, averageCharsPerByte, maxCharsPerByte);
         }
 
         @Override
         protected CoderResult decodeLoop(ByteBuffer in, CharBuffer out) {
             while (in.remaining() > 0) {
-                in.get();
-                out.put('Z');
+                char c = (char)in.get();
+                if (c != '\n') {
+                    out.put(Character.toUpperCase(c));
+                }
             }
             return CoderResult.UNDERFLOW;
         }

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

@@ -24,11 +24,23 @@
 set java [lrange $argv 0 end]
 
 eval spawn $java
+
+# Console::readLine()
 send "abc\r"
 
-# expect 4 'Z's converted with ZCharset with the input 'abc\r'
-expect "ZZZZ" {
+# Console::readPassword()
+send "def\r"
+
+# Console::reader()
+send "ghi\r"
+
+# check the output
+expect "ABCDEFGHI" {
     expect eof
+    send_error "Mocked output received"
     exit 0
 }
+
+# fail
+send_error "Mocked output not received."
 exit 1