Adjusting tests.

lahodaj · Nov 11, 2024 · aea3db4 · aea3db4
1 parent 7bfdd2a
commit aea3db4
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 26 deletions.
diff --git a/test/jdk/java/io/IO/IO.java → test/jdk/java/lang/IO/IO.java b/test/jdk/java/io/IO/IO.java → test/jdk/java/lang/IO/IO.java
@@ -49,7 +49,7 @@
 /*
  * @test
  * @bug 8305457
- * @summary java.io.IO tests
+ * @summary java.lang.IO tests
  * @library /test/lib
  * @run junit IO
  */

diff --git a/test/jdk/java/io/IO/Input.java → test/jdk/java/lang/IO/Input.java b/test/jdk/java/io/IO/Input.java → test/jdk/java/lang/IO/Input.java
@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 
-import static java.io.IO.readln;
+import static java.lang.IO.readln;
 
 public class Input {
 

diff --git a/test/jdk/java/io/IO/Methods.java → test/jdk/java/lang/IO/Methods.java b/test/jdk/java/io/IO/Methods.java → test/jdk/java/lang/IO/Methods.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static java.io.IO.*;
+import static java.lang.IO.*;
 
 public class Methods {
 

diff --git a/test/jdk/java/io/IO/Output.java → test/jdk/java/lang/IO/Output.java b/test/jdk/java/io/IO/Output.java → test/jdk/java/lang/IO/Output.java
@@ -21,7 +21,7 @@
  * questions.
  */
 
-import static java.io.IO.*;
+import static java.lang.IO.*;
 import java.util.function.Consumer;
 
 public class Output {

diff --git a/test/jdk/java/io/IO/input.exp → test/jdk/java/lang/IO/input.exp b/test/jdk/java/io/IO/input.exp → test/jdk/java/lang/IO/input.exp
diff --git a/test/jdk/java/io/IO/output.exp → test/jdk/java/lang/IO/output.exp b/test/jdk/java/io/IO/output.exp → test/jdk/java/lang/IO/output.exp
diff --git a/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.java b/test/jdk/jdk/internal/jline/LazyJdkConsoleProvider.java
@@ -32,7 +32,7 @@
  * @run main LazyJdkConsoleProvider
  */
 
-import java.io.IO;
+import java.lang.IO;
 import jdk.internal.org.jline.reader.LineReader;
 import jdk.internal.org.jline.terminal.Terminal;
 

diff --git a/test/langtools/tools/javac/ImplicitClass/ImplicitImports.java b/test/langtools/tools/javac/ImplicitClass/ImplicitImports.java
@@ -148,29 +148,26 @@ public static void main(String... args) {
 
         Files.createDirectories(classes);
 
-        new JavacTask(tb)
-            .options("--enable-preview", "--release", SOURCE_VERSION,
-                     "--patch-module", "java.base=" + patchClasses)
-            .outdir(classes)
-            .files(tb.findJavaFiles(src))
-            .run(Task.Expect.SUCCESS)
-            .writeAll();
-
-        var out = new JavaTask(tb)
-                .classpath(classes.toString())
-                .className("Test")
-                .vmOptions("--enable-preview",
-                           "--patch-module", "java.base=" + patchClasses)
-                .run()
+        var log = new JavacTask(tb)
+                .options("--enable-preview", "--release", SOURCE_VERSION,
+                         "--patch-module", "java.base=" + patchClasses,
+                        "-XDrawDiagnostics")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run(Task.Expect.FAIL)
                 .writeAll()
-                .getOutputLines(Task.OutputKind.STDOUT);
-
-        var expectedOut = List.of("Hello, World!");
+                .getOutputLines(OutputKind.DIRECT);
 
-        if (!Objects.equals(expectedOut, out)) {
-            throw new AssertionError("Incorrect Output, expected: " + expectedOut +
-                                      ", actual: " + out);
+        var expectedLog = List.of(
+            "Test.java:2:5: compiler.err.cant.resolve.location.args: kindname.method, println, , java.lang.String, (compiler.misc.location: kindname.class, Test, null)",
+            "- compiler.note.preview.filename: Test.java, DEFAULT",
+            "- compiler.note.preview.recompile",
+            "1 error"
+        );
 
+        if (!Objects.equals(expectedLog, log)) {
+            throw new AssertionError("Incorrect Output, expected: " + expectedLog +
+                                      ", actual: " + log);
         }
     }
 

diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -121,6 +121,7 @@ compiler.warn.illegal.char.for.encoding
 compiler.warn.incubating.modules                        # requires adjusted classfile
 compiler.warn.invalid.archive.file
 compiler.warn.invalid.utf8.in.classfile                 # bad class file
+compiler.warn.is.preview                                # difficult to produce reliably despite future changes to java.base
 compiler.warn.is.preview.reflective                     # difficult to produce reliably despite future changes to java.base
 compiler.warn.output.file.clash                         # this warning is not generated on Linux
 compiler.warn.override.bridge

diff --git a/test/langtools/tools/javac/diags/examples/ImplicitClass.java b/test/langtools/tools/javac/diags/examples/ImplicitClass.java
@@ -23,7 +23,6 @@
 
 // key: compiler.misc.feature.implicit.classes
 // key: compiler.warn.preview.feature.use.plural
-// key: compiler.warn.is.preview
 // options: -source ${jdk.version} --enable-preview -Xlint:preview
 
 public static void main(String... args) {