< prev index next >
test/tools/javac/modules/UpgradeModulePathTest.java
Print this page
*** 36,46 ****
import java.nio.file.Path;
import toolbox.JavacTask;
import toolbox.ModuleBuilder;
import toolbox.Task;
- import toolbox.ToolBox;
public class UpgradeModulePathTest extends ModuleTestBase {
public static void main(String... args) throws Exception {
UpgradeModulePathTest t = new UpgradeModulePathTest();
--- 36,45 ----
*** 48,70 ****
}
@Test
public void simpleUsage(Path base) throws Exception {
Path modules = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(modules);
final Path upgradeModules = base.resolve("upgradeModules");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModules);
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())
--- 47,69 ----
}
@Test
public void simpleUsage(Path base) throws Exception {
Path modules = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(modules);
final Path upgradeModules = base.resolve("upgradeModules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModules);
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"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())
*** 74,96 ****
}
@Test
public void onlyUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
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))
--- 73,95 ----
}
@Test
public void onlyUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"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))
*** 99,130 ****
}
@Test
public void withModuleSourcePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
final Path s = base.resolve("source");
! tb.writeJavaFiles(s.resolve("m3"), "module m3 { }");
final Path upgradeModule3 = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m3")
.exports("pkg3")
.classes("package pkg3; public class E { }")
.build(upgradeModule);
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,
--- 98,129 ----
}
@Test
public void withModuleSourcePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
final Path s = base.resolve("source");
! tb.writeJavaFiles(s.resolve("m3x"), "module m3x { }");
final Path upgradeModule3 = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m3x")
.exports("pkg3")
.classes("package pkg3; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
! tb.writeJavaFiles(src.resolve("m2x"), "module m2x { requires m1x; requires m3x; }",
"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,
*** 136,158 ****
}
@Test
public void sameUpgradeAndModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
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())
--- 135,157 ----
}
@Test
public void sameUpgradeAndModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"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())
*** 162,181 ****
}
@Test
public void dummyFileInUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
Path dummy = base.resolve("dummy.txt");
tb.writeFile(dummy, "");
Path src = base.resolve("src");
! 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(),
--- 161,180 ----
}
@Test
public void dummyFileInUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
Path dummy = base.resolve("dummy.txt");
tb.writeFile(dummy, "");
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
String output = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"--module-path", module.toString(),
*** 190,232 ****
}
@Test
public void severalUpgradeModules(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class A { }")
.build(module);
! new ModuleBuilder(tb, "m2")
.exports("pkg2")
.classes("package pkg2; public class B { }")
.build(module);
Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m2")
.exports("pkg2")
.classes("package pkg2; public class BC { }")
.build(upgradeModule);
! new ModuleBuilder(tb, "m3")
.exports("pkg3")
.classes("package pkg3; public class DC { }")
.build(upgradeModule);
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(),
--- 189,231 ----
}
@Test
public void severalUpgradeModules(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class A { }")
.build(module);
! new ModuleBuilder(tb, "m2x")
.exports("pkg2")
.classes("package pkg2; public class B { }")
.build(module);
Path upgradeModule = base.resolve("upgradeModule");
! new ModuleBuilder(tb, "m2x")
.exports("pkg2")
.classes("package pkg2; public class BC { }")
.build(upgradeModule);
! new ModuleBuilder(tb, "m3x")
.exports("pkg3")
.classes("package pkg3; public class DC { }")
.build(upgradeModule);
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m4x { requires m1x; requires m2x; requires m3x; }",
"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 m4x { requires m1x; }",
"package p; class A { void main() { pkg2.B.class.getName(); } }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"--module-path", module.toString(),
*** 241,269 ****
}
@Test
public void severalUpgradeModulePathsLastWin(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule1 = base.resolve("upgradeModule1");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class EC1 { }")
.build(upgradeModule1);
final Path upgradeModule2 = base.resolve("upgradeModule2");
! new ModuleBuilder(tb, "m1")
.exports("pkg2")
.classes("package pkg2; public class EC2 { }")
.build(upgradeModule2);
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(),
--- 240,268 ----
}
@Test
public void severalUpgradeModulePathsLastWin(Path base) throws Exception {
final Path module = base.resolve("modules");
! new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule1 = base.resolve("upgradeModule1");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class EC1 { }")
.build(upgradeModule1);
final Path upgradeModule2 = base.resolve("upgradeModule2");
! new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class EC2 { }")
.build(upgradeModule2);
Path src = base.resolve("src");
! tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"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(),
*** 271,281 ****
.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(),
--- 270,280 ----
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
! tb.writeJavaFiles(src2, "module m2x { requires m1x; }",
"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(),
< prev index next >