< prev index next >
langtools/test/tools/javac/modules/AddReadsTest.java
Print this page
@@ -21,11 +21,11 @@
* questions.
*/
/*
* @test
- * @summary Test the -XaddReads option
+ * @summary Test the --add-reads option
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavapTask ModuleTestBase
@@ -71,11 +71,11 @@
Path classes = base.resolve("classes");
tb.createDirectories(classes);
String log = new JavacTask(tb)
.options("-XDrawDiagnostics",
- "-modulesourcepath", src.toString())
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
@@ -83,12 +83,12 @@
if (!log.contains("Test.java:1:44: compiler.err.not.def.access.package.cant.access: api.Api, api"))
throw new Exception("expected output not found");
//test add dependencies:
new JavacTask(tb)
- .options("-XaddReads:m2=m1",
- "-modulesourcepath", src.toString(),
+ .options("--add-reads", "m2=m1",
+ "--module-source-path", src.toString(),
"-processor", VerifyRequires.class.getName())
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -102,23 +102,23 @@
throw new Exception("Incorrectly refers to m1 module.");
}
//cyclic dependencies OK when created through addReads:
new JavacTask(tb)
- .options("-XaddReads:m2=m1,m1=m2",
- "-modulesourcepath", src.toString())
+ .options("--add-reads", "m2=m1,m1=m2",
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();
tb.writeJavaFiles(src_m2,
"module m2 { requires m1; }");
new JavacTask(tb)
- .options("-XaddReads:m1=m2",
- "-modulesourcepath", src.toString())
+ .options("--add-reads", "m1=m2",
+ "--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();
}
@@ -163,12 +163,12 @@
tb.writeJavaFiles(m1,
"module m1 { }",
"package impl; public class Impl { api.Api api; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--add-reads", "m1=ALL-UNNAMED",
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
@@ -189,13 +189,13 @@
"module m1 { }",
"package api; public class Api { public static void test() { } }",
"package impl; public class Impl { { api.Api.test(); } }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-modulesourcepath", moduleSrc.toString(),
- "-XaddReads:m1=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--module-source-path", moduleSrc.toString(),
+ "--add-reads", "m1=ALL-UNNAMED",
"-XDrawDiagnostics")
.outdir(classes)
.files(m1.resolve("impl").resolve("Impl.java"))
.run()
.writeAll();
@@ -211,12 +211,12 @@
tb.writeJavaFiles(src,
"package impl; public class Impl { api.Api a; }");
new JavacTask(tb)
- .options("-classpath", jar.toString(),
- "-XaddReads:java.base=ALL-UNNAMED",
+ .options("--class-path", jar.toString(),
+ "--add-reads", "java.base=ALL-UNNAMED",
"-Xmodule:java.base")
.outdir(classes)
.files(src.resolve("impl").resolve("Impl.java"))
.run()
.writeAll();
@@ -231,11 +231,11 @@
tb.writeJavaFiles(src,
"package impl; public class Impl { javax.swing.JButton b; }");
new JavacTask(tb)
- .options("-XaddReads:java.base=java.desktop",
+ .options("--add-reads", "java.base=java.desktop",
"-Xmodule:java.base")
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -283,11 +283,11 @@
"package impl; public class Impl implements Runnable { public void run() { } }");
Path classes = base.resolve("classes");
tb.createDirectories(classes);
new JavacTask(tb)
- .options("-modulesourcepath", src.toString())
+ .options("--module-source-path", src.toString())
.outdir(classes)
.files(findJavaFiles(src))
.run()
.writeAll();
@@ -298,13 +298,13 @@
tb.writeJavaFiles(unnamedSrc,
"package impl; public class Impl { }");
new JavacTask(tb)
- .options("-XaddReads:m1=ALL-UNNAMED",
+ .options("--add-reads", "m1=ALL-UNNAMED",
"-Xmodule:m1",
- "-modulepath", classes.toString())
+ "--module-path", classes.toString())
.outdir(unnamedClasses)
.files(findJavaFiles(unnamedSrc))
.run()
.writeAll();
}
< prev index next >