< prev index next >
langtools/test/tools/javac/modules/ModulePathTest.java
Print this page
*** 21,31 ****
* questions.
*/
/*
* @test
! * @summary tests for -modulepath
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
--- 21,31 ----
* questions.
*/
/*
* @test
! * @summary tests for --module-path
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
*** 60,76 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "class C { }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", "doesNotExist")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, doesNotExist"))
throw new Exception("expected output not found");
}
@Test
public void testNotADirOnPath_1(Path base) throws Exception {
--- 60,76 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "class C { }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", "doesNotExist")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, doesNotExist"))
throw new Exception("expected output not found");
}
@Test
public void testNotADirOnPath_1(Path base) throws Exception {
*** 78,94 ****
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.txt", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", "dummy.txt")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, dummy.txt"))
throw new Exception("expected output not found");
}
@Test
public void testNotADirOnPath_2(Path base) throws Exception {
--- 78,94 ----
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.txt", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", "dummy.txt")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, dummy.txt"))
throw new Exception("expected output not found");
}
@Test
public void testNotADirOnPath_2(Path base) throws Exception {
*** 96,112 ****
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jimage", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", "dummy.jimage")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: -modulepath, dummy.jimage"))
throw new Exception("expected output not found");
}
@Test
public void testExplodedModuleOnPath(Path base) throws Exception {
--- 96,112 ----
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jimage", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", "dummy.jimage")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
! if (!log.contains("- compiler.err.illegal.argument.for.option: --module-path, dummy.jimage"))
throw new Exception("expected output not found");
}
@Test
public void testExplodedModuleOnPath(Path base) throws Exception {
*** 130,140 ****
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("-modulepath", modClasses.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 130,140 ----
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 151,161 ****
Files.createDirectories(classes);
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
.options("-XDrawDiagnostics",
! "-modulepath", modClasses.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
--- 151,161 ----
Files.createDirectories(classes);
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
.options("-XDrawDiagnostics",
! "--module-path", modClasses.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
*** 188,198 ****
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("-modulepath", moduleJar.toString(), "-addmods", "m1")
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 188,198 ----
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("--module-path", moduleJar.toString(), "--add-modules", "m1")
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 224,234 ****
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("-modulepath", moduleJar.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 224,234 ----
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("--module-path", moduleJar.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 238,248 ****
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jar", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", "dummy.jar")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
--- 238,248 ----
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jar", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", "dummy.jar")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
*** 275,285 ****
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("-modulepath", jmod.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 275,285 ----
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb, Task.Mode.CMDLINE)
.outdir(classes)
! .options("--module-path", jmod.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 289,299 ****
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jmod", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", "dummy.jmod")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
--- 289,299 ----
tb.writeJavaFiles(src, "class C { }");
tb.writeFile("dummy.jmod", "");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", "dummy.jmod")
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
*** 309,319 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", modules + "/./../modules")
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 309,319 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", modules + "/./../modules")
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 325,335 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", modules + "/./../modules" + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 325,335 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", modules + "/./../modules" + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 341,352 ****
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", modules.toString(),
! "-modulepath", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 341,352 ----
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", modules.toString(),
! "--module-path", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 368,378 ****
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("-XDrawDiagnostics",
! "-modulepath", deepModuleDir + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 368,378 ----
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("-XDrawDiagnostics",
! "--module-path", deepModuleDir + PATH_SEP + modules)
.files(findJavaFiles(src))
.run()
.writeAll();
}
*** 398,408 ****
tb.writeJavaFiles(src, "module m { requires m3; requires m2; requires m1; }",
"package p; class A { void main() { one.A.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "-modulepath", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
--- 398,408 ----
tb.writeJavaFiles(src, "module m { requires m3; requires m2; requires m1; }",
"package p; class A { void main() { one.A.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
! "--module-path", modules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
< prev index next >