< prev index next >
test/tools/javac/modules/ModulesAndClassPathTest.java
Print this page
@@ -56,18 +56,18 @@
@Test
public void testModulesAndClassPath(Path base) throws Exception {
Path jar = prepareTestJar(base);
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { }",
+ "module m { }",
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
.options("--class-path", jar.toString(),
"-XDrawDiagnostics")
@@ -84,20 +84,20 @@
throw new Exception("unexpected output: " + modLog);
}
new JavacTask(tb)
.options("--class-path", jar.toString(),
- "--add-reads", "m1=ALL-UNNAMED")
+ "--add-reads", "m=ALL-UNNAMED")
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
new JavacTask(tb)
.options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
- "--add-reads", "m1=ALL-UNNAMED",
+ "--add-reads", "m=ALL-UNNAMED",
"-processor", ProcessorImpl.class.getName())
.outdir(classes)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll()
@@ -107,18 +107,18 @@
@Test
public void testImplicitSourcePathModuleInfo(Path base) throws Exception {
Path jar = prepareTestJar(base);
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { }",
+ "module m { }",
"package impl; public class Impl { api.Api api; }");
List<String> modLog = new JavacTask(tb)
.options("--class-path", jar.toString(),
"-sourcepath", m1.toString(),
@@ -140,18 +140,18 @@
@Test
public void testModuleInfoFromOutput(Path base) throws Exception {
Path jar = prepareTestJar(base);
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { }",
+ "module m { }",
"package impl; public class Impl { api.Api api; }");
new JavacTask(tb)
.options("--class-path", jar.toString(),
"-XDrawDiagnostics")
@@ -220,18 +220,18 @@
}
@Test
public void testClassOutputVisibleForIncrementalCompilation(Path base) throws Exception {
Path moduleSrc = base.resolve("module-src");
- Path m1 = moduleSrc.resolve("m1");
+ Path m1 = moduleSrc.resolve("m");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
tb.writeJavaFiles(m1,
- "module m1 { exports impl; }",
+ "module m { exports impl; }",
"package impl; public class Impl { }",
"package src; public class Src { }",
"package test; public class TestCP extends impl.Impl { }",
"package test; public class TestSP extends src.Src { }");
< prev index next >