< prev index next >
test/tools/javac/modules/AutomaticModules.java
Print this page
@@ -80,18 +80,18 @@
.baseDir(legacyClasses)
.files("api/Api.class")
.run();
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m1x");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { requires test.api; requires java.desktop; }",
+ "module m1x { 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)
@@ -138,18 +138,18 @@
.baseDir(legacyClasses)
.files("base/Base.class")
.run();
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m1x");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { requires test.api; }",
+ "module m1x { 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)
@@ -191,21 +191,21 @@
Files.createDirectories(depSrc);
Files.createDirectories(depClasses);
tb.writeJavaFiles(depSrc,
- "module m1 { requires transitive automatic; }",
+ "module m1x { requires transitive automatic; }",
"package dep; public class Dep { api.Api api; }");
new JavacTask(tb)
.options("--module-path", modulePath.toString())
.outdir(depClasses)
.files(findJavaFiles(depSrc))
.run()
.writeAll();
- Path moduleJar = modulePath.resolve("m1.jar");
+ Path moduleJar = modulePath.resolve("m1x.jar");
new JarTask(tb, moduleJar)
.baseDir(depClasses)
.files("module-info.class", "dep/Dep.class")
.run();
@@ -215,11 +215,11 @@
Files.createDirectories(testSrc);
Files.createDirectories(testClasses);
tb.writeJavaFiles(testSrc,
- "module m2 { requires automatic; }",
+ "module m2x { requires automatic; }",
"package test; public class Test { }");
new JavacTask(tb)
.options("--module-path", modulePath.toString())
.outdir(testClasses)
@@ -258,17 +258,17 @@
.run();
}
Path moduleSrc = base.resolve("module-src");
- tb.writeJavaFiles(moduleSrc.resolve("m1"),
- "module m1 { requires static automaticA; }",
- "package impl; public class Impl { apiA.Api a; apiB.Api b; m2.M2 m;}");
-
- tb.writeJavaFiles(moduleSrc.resolve("m2"),
- "module m2 { exports m2; }",
- "package m2; public class M2 { }");
+ tb.writeJavaFiles(moduleSrc.resolve("m1x"),
+ "module m1x { requires static automaticA; }",
+ "package impl; public class Impl { apiA.Api a; apiB.Api b; m2x.M2 m;}");
+
+ tb.writeJavaFiles(moduleSrc.resolve("m2x"),
+ "module m2x { exports m2x; }",
+ "package m2x; public class M2 { }");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
@@ -281,11 +281,11 @@
.files(findJavaFiles(moduleSrc))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
- List<String> expected = Arrays.asList("Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
+ List<String> expected = Arrays.asList("Impl.java:1:62: compiler.err.not.def.access.package.cant.access: m2x.M2, m2x",
"1 error");
if (!expected.equals(log)) {
throw new Exception("expected output not found: " + log);
}
@@ -299,11 +299,11 @@
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
expected = Arrays.asList("Impl.java:1:51: compiler.err.doesnt.exist: apiB",
- "Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
+ "Impl.java:1:62: compiler.err.not.def.access.package.cant.access: m2x.M2, m2x",
"2 errors");
if (!expected.equals(log)) {
throw new Exception("expected output not found: " + log);
}
< prev index next >