< prev index next >
test/tools/javac/modules/UpgradeModulePathTest.java
Print this page
*** 64,75 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-modulepath", modules.toString(),
! "-upgrademodulepath", upgradeModules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 64,75 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--module-path", modules.toString(),
! "--upgrade-module-path", upgradeModules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 90,100 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-upgrademodulepath", upgradeModule + File.pathSeparator + module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 90,100 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--upgrade-module-path", upgradeModule + File.pathSeparator + module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 124,136 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; requires m3; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-modulepath", module.toString(),
! "-modulesourcepath", src + File.pathSeparator + s,
! "-upgrademodulepath", upgradeModule + File.pathSeparator + upgradeModule3)
.outdir(module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 124,136 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src.resolve("m2"), "module m2 { requires m1; requires m3; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--module-path", module.toString(),
! "--module-source-path", src + File.pathSeparator + s,
! "--upgrade-module-path", upgradeModule + File.pathSeparator + upgradeModule3)
.outdir(module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 152,163 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-modulepath", upgradeModule + File.pathSeparator + module,
! "-upgrademodulepath", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 152,163 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--module-path", upgradeModule + File.pathSeparator + module,
! "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 176,192 ****
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
String output = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", module.toString(),
! "-upgrademodulepath", dummy.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!output.contains("compiler.err.illegal.argument.for.option: -upgrademodulepath, " + dummy)) {
throw new Exception("Expected output was not found");
}
}
@Test
--- 176,192 ----
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
String output = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", module.toString(),
! "--upgrade-module-path", dummy.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!output.contains("compiler.err.illegal.argument.for.option: --upgrade-module-path, " + dummy)) {
throw new Exception("Expected output was not found");
}
}
@Test
*** 215,238 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m4 { requires m1; requires m2; requires m3; }",
"package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-modulepath", module.toString(),
! "-upgrademodulepath", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m4 { requires m1; }",
"package p; class A { void main() { pkg2.B.class.getName(); } }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", module.toString(),
! "-upgrademodulepath", upgradeModule.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("compiler.err.doesnt.exist: pkg2")) {
--- 215,238 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m4 { requires m1; requires m2; requires m3; }",
"package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--module-path", module.toString(),
! "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m4 { requires m1; }",
"package p; class A { void main() { pkg2.B.class.getName(); } }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", module.toString(),
! "--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("compiler.err.doesnt.exist: pkg2")) {
*** 263,288 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.EC2.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("-modulepath", module.toString(),
! "-upgrademodulepath", upgradeModule1.toString(),
! "-upgrademodulepath", upgradeModule2.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.EC1.class.getName(); } }");
final String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", module.toString(),
! "-upgrademodulepath", upgradeModule1.toString(),
! "-upgrademodulepath", upgradeModule2.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
--- 263,288 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.EC2.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
! .options("--module-path", module.toString(),
! "--upgrade-module-path", upgradeModule1.toString(),
! "--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m2 { requires m1; }",
"package p; class A { void main() { pkg2.EC1.class.getName(); } }");
final String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", module.toString(),
! "--upgrade-module-path", upgradeModule1.toString(),
! "--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
< prev index next >