< prev index next >
langtools/test/tools/javac/modules/AddLimitMods.java
Print this page
*** 21,31 ****
* questions.
*/
/**
* @test
! * @summary Test -addmods and -limitmods; also test the "enabled" modules.
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.main
--- 21,31 ----
* questions.
*/
/**
* @test
! * @summary Test --add-modules and --limit-modules; also test the "enabled" modules.
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.main
*** 101,176 ****
Path modulePath = base.resolve("module-path");
Files.createDirectories(modulePath);
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m3))
.run()
.writeAll();
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m2))
.run()
.writeAll();
//real test
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "java.base")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "java.base",
! "-addmods", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "java.base",
! "-addmods", "m2,m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "-limitmods", "m3",
! "-addmods", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
}
--- 101,176 ----
Path modulePath = base.resolve("module-path");
Files.createDirectories(modulePath);
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m3))
.run()
.writeAll();
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(m2))
.run()
.writeAll();
//real test
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "java.base")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "java.base",
! "--add-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "java.base",
! "--add-modules", "m2,m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "m3")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
"-Xshouldstop:ifNoError=FLOW",
! "--limit-modules", "m3",
! "--add-modules", "m2")
.outdir(modulePath)
.files(findJavaFiles(m1))
.run()
.writeAll();
}
*** 217,231 ****
private static final List<Entry<String[], String>> variants = Arrays.asList(
new SimpleEntry<String[], String>(new String[] {},
"Test.java:2:18: compiler.err.doesnt.exist: javax.annotation\n"
+ "Test.java:5:19: compiler.err.doesnt.exist: javax.xml.bind\n"
+ "2 errors\n"),
! new SimpleEntry<String[], String>(new String[] {"-addmods", "java.annotations.common,java.xml.bind"},
null),
! new SimpleEntry<String[], String>(new String[] {"-limitmods", "java.xml.ws,jdk.compiler"},
null),
! new SimpleEntry<String[], String>(new String[] {"-addmods", "ALL-SYSTEM"},
null)
);
@Test
public void testAllModulePath(Path base) throws Exception {
--- 217,231 ----
private static final List<Entry<String[], String>> variants = Arrays.asList(
new SimpleEntry<String[], String>(new String[] {},
"Test.java:2:18: compiler.err.doesnt.exist: javax.annotation\n"
+ "Test.java:5:19: compiler.err.doesnt.exist: javax.xml.bind\n"
+ "2 errors\n"),
! new SimpleEntry<String[], String>(new String[] {"--add-modules", "java.annotations.common,java.xml.bind"},
null),
! new SimpleEntry<String[], String>(new String[] {"--limit-modules", "java.xml.ws,jdk.compiler"},
null),
! new SimpleEntry<String[], String>(new String[] {"--add-modules", "ALL-SYSTEM"},
null)
);
@Test
public void testAllModulePath(Path base) throws Exception {
*** 242,252 ****
Path modulePath = base.resolve("module-path");
Files.createDirectories(modulePath);
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
--- 242,252 ----
Path modulePath = base.resolve("module-path");
Files.createDirectories(modulePath);
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
*** 256,274 ****
Path cpOut = base.resolve("cp-out");
Files.createDirectories(cpOut);
new JavacTask(tb)
! .options("-modulepath", modulePath.toString())
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("-modulepath", modulePath.toString(),
! "-addmods", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run()
.writeAll();
--- 256,274 ----
Path cpOut = base.resolve("cp-out");
Files.createDirectories(cpOut);
new JavacTask(tb)
! .options("--module-path", modulePath.toString())
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll();
new JavacTask(tb)
! .options("--module-path", modulePath.toString(),
! "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run()
.writeAll();
*** 276,288 ****
List<String> expected = Arrays.asList(
"- compiler.err.addmods.all.module.path.invalid",
"1 error");
actual = new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString(),
"-XDrawDiagnostics",
! "-addmods", "ALL-MODULE-PATH")
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
--- 276,288 ----
List<String> expected = Arrays.asList(
"- compiler.err.addmods.all.module.path.invalid",
"1 error");
actual = new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString(),
"-XDrawDiagnostics",
! "--add-modules", "ALL-MODULE-PATH")
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
*** 292,302 ****
}
actual = new JavacTask(tb)
.options("-Xmodule:java.base",
"-XDrawDiagnostics",
! "-addmods", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
--- 292,302 ----
}
actual = new JavacTask(tb)
.options("-Xmodule:java.base",
"-XDrawDiagnostics",
! "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
*** 306,331 ****
}
actual = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-source", "8", "-target", "8",
"-XDrawDiagnostics",
! "-addmods", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
! if (!actual.contains("javac: option -addmods not allowed with target 1.8")) {
throw new IllegalStateException("incorrect errors; actual=" + actual);
}
tb.writeJavaFiles(cpSrc, "module m1 {}");
actual = new JavacTask(tb)
.options("-XDrawDiagnostics",
! "-addmods", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
--- 306,331 ----
}
actual = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-source", "8", "-target", "8",
"-XDrawDiagnostics",
! "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
! if (!actual.contains("javac: option --add-modules not allowed with target 1.8")) {
throw new IllegalStateException("incorrect errors; actual=" + actual);
}
tb.writeJavaFiles(cpSrc, "module m1 {}");
actual = new JavacTask(tb)
.options("-XDrawDiagnostics",
! "--add-modules", "ALL-MODULE-PATH")
.outdir(cpOut)
.files(findJavaFiles(cpSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
*** 384,394 ****
tb.writeJavaFiles(m1,
"module m1 { exports api; }",
"package api; public class Api { public void test() { } }");
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
--- 384,394 ----
tb.writeJavaFiles(m1,
"module m1 { exports api; }",
"package api; public class Api { public void test() { } }");
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString())
.outdir(modulePath)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
*** 426,436 ****
"}");
tb.writeJavaFiles(m2Runtime, moduleInfo, testClassNamed.toString());
new JavacTask(tb)
! .options("-modulepath", modulePath.toString())
.outdir(out)
.files(findJavaFiles(m2Runtime))
.run()
.writeAll();
--- 426,436 ----
"}");
tb.writeJavaFiles(m2Runtime, moduleInfo, testClassNamed.toString());
new JavacTask(tb)
! .options("--module-path", modulePath.toString())
.outdir(out)
.files(findJavaFiles(m2Runtime))
.run()
.writeAll();
*** 439,451 ****
try {
output = new JavaTask(tb)
.vmOptions(augmentOptions(options,
Collections.emptyList(),
! "-modulepath", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
! "-classpath", classpathOut.toString(),
! "-XaddReads:m2=ALL-UNNAMED,automatic",
"-m", "m2/test.Test"))
.run()
.writeAll()
.getOutput(Task.OutputKind.STDERR);
--- 439,451 ----
try {
output = new JavaTask(tb)
.vmOptions(augmentOptions(options,
Collections.emptyList(),
! "--module-path", modulePath.toString() + File.pathSeparator + out.getParent().toString(),
! "--class-path", classpathOut.toString(),
! "--add-reads", "m2=ALL-UNNAMED,automatic",
"-m", "m2/test.Test"))
.run()
.writeAll()
.getOutput(Task.OutputKind.STDERR);
*** 461,480 ****
moduleInfo,
"package test;\n" +
"public class Test {}\n");
List<String> auxOptions = success ? Arrays.asList(
! "-processorpath", System.getProperty("test.class.path"),
"-processor", CheckVisibleModule.class.getName(),
"-Aoutput=" + output,
"-XDaccessInternalAPI=true"
) : Collections.emptyList();
new JavacTask(tb)
.options(augmentOptions(options,
auxOptions,
! "-modulepath", modulePath.toString(),
! "-classpath", classpathOut.toString(),
"-Xshouldstop:ifNoError=FLOW"))
.outdir(modulePath)
.files(findJavaFiles(m2))
.run(success ? Task.Expect.SUCCESS : Task.Expect.FAIL)
.writeAll();
--- 461,480 ----
moduleInfo,
"package test;\n" +
"public class Test {}\n");
List<String> auxOptions = success ? Arrays.asList(
! "--processor-path", System.getProperty("test.class.path"),
"-processor", CheckVisibleModule.class.getName(),
"-Aoutput=" + output,
"-XDaccessInternalAPI=true"
) : Collections.emptyList();
new JavacTask(tb)
.options(augmentOptions(options,
auxOptions,
! "--module-path", modulePath.toString(),
! "--class-path", classpathOut.toString(),
"-Xshouldstop:ifNoError=FLOW"))
.outdir(modulePath)
.files(findJavaFiles(m2))
.run(success ? Task.Expect.SUCCESS : Task.Expect.FAIL)
.writeAll();
*** 576,591 ****
"module m2 { requires m1; exports test; }",
"module m2 { requires jdk.compiler; exports test; }",
};
private static final String[][] OPTIONS_VARIANTS = {
! {"-addmods", "automatic"},
! {"-addmods", "m1,automatic"},
! {"-addmods", "jdk.compiler,automatic"},
! {"-addmods", "m1,jdk.compiler,automatic"},
! {"-addmods", "ALL-SYSTEM,automatic"},
! {"-limitmods", "java.base", "-addmods", "automatic"},
! {"-limitmods", "java.base", "-addmods", "ALL-SYSTEM,automatic"},
! {"-limitmods", "m2", "-addmods", "automatic"},
! {"-limitmods", "jdk.compiler", "-addmods", "automatic"},
};
}
--- 576,591 ----
"module m2 { requires m1; exports test; }",
"module m2 { requires jdk.compiler; exports test; }",
};
private static final String[][] OPTIONS_VARIANTS = {
! {"--add-modules", "automatic"},
! {"--add-modules", "m1,automatic"},
! {"--add-modules", "jdk.compiler,automatic"},
! {"--add-modules", "m1,jdk.compiler,automatic"},
! {"--add-modules", "ALL-SYSTEM,automatic"},
! {"--limit-modules", "java.base", "--add-modules", "automatic"},
! {"--limit-modules", "java.base", "--add-modules", "ALL-SYSTEM,automatic"},
! {"--limit-modules", "m2", "--add-modules", "automatic"},
! {"--limit-modules", "jdk.compiler", "--add-modules", "automatic"},
};
}
< prev index next >