< prev index next >
langtools/test/tools/javac/modules/AutomaticModules.java
Print this page
*** 91,101 ****
tb.writeJavaFiles(m1,
"module m1 { requires test.api; requires java.desktop; }",
"package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }");
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
}
--- 91,101 ----
tb.writeJavaFiles(m1,
"module m1 { requires test.api; requires java.desktop; }",
"package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }");
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
}
*** 149,159 ****
tb.writeJavaFiles(m1,
"module m1 { requires test.api; }",
"package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }");
new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString(), "-classpath", baseJar.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
}
--- 149,159 ----
tb.writeJavaFiles(m1,
"module m1 { requires test.api; }",
"package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }");
new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString(), "--class-path", baseJar.toString())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll();
}
*** 195,205 ****
tb.writeJavaFiles(depSrc,
"module m1 { requires public automatic; }",
"package dep; public class Dep { api.Api api; }");
new JavacTask(tb)
! .options("-modulepath", modulePath.toString())
.outdir(depClasses)
.files(findJavaFiles(depSrc))
.run()
.writeAll();
--- 195,205 ----
tb.writeJavaFiles(depSrc,
"module m1 { requires public automatic; }",
"package dep; public class Dep { api.Api api; }");
new JavacTask(tb)
! .options("--module-path", modulePath.toString())
.outdir(depClasses)
.files(findJavaFiles(depSrc))
.run()
.writeAll();
*** 219,229 ****
tb.writeJavaFiles(testSrc,
"module m2 { requires automatic; }",
"package test; public class Test { }");
new JavacTask(tb)
! .options("-modulepath", modulePath.toString())
.outdir(testClasses)
.files(findJavaFiles(testSrc))
.run()
.writeAll();
}
--- 219,229 ----
tb.writeJavaFiles(testSrc,
"module m2 { requires automatic; }",
"package test; public class Test { }");
new JavacTask(tb)
! .options("--module-path", modulePath.toString())
.outdir(testClasses)
.files(findJavaFiles(testSrc))
.run()
.writeAll();
}
*** 271,283 ****
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString(),
! "-modulepath", modulePath.toString(),
! "-addmods", "automaticB",
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
--- 271,283 ----
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> log = new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString(),
! "--module-path", modulePath.toString(),
! "--add-modules", "automaticB",
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
*** 289,300 ****
if (!expected.equals(log)) {
throw new Exception("expected output not found: " + log);
}
log = new JavacTask(tb)
! .options("-modulesourcepath", moduleSrc.toString(),
! "-modulepath", modulePath.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
--- 289,300 ----
if (!expected.equals(log)) {
throw new Exception("expected output not found: " + log);
}
log = new JavacTask(tb)
! .options("--module-source-path", moduleSrc.toString(),
! "--module-path", modulePath.toString(),
"-XDrawDiagnostics")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
< prev index next >