< prev index next >
langtools/test/tools/jdeps/modules/ModuleTest.java
Print this page
*** 21,31 ****
* questions.
*/
/*
* @test
! * @summary Tests jdeps -m and -mp options on named modules and unnamed modules
* @library ../lib
* @build CompilerUtils JdepsUtil
* @modules jdk.jdeps/com.sun.tools.jdeps
* @run testng ModuleTest
*/
--- 21,31 ----
* questions.
*/
/*
* @test
! * @summary Tests jdeps -m and --module-path options on named modules and unnamed modules
* @library ../lib
* @build CompilerUtils JdepsUtil
* @modules jdk.jdeps/com.sun.tools.jdeps
* @run testng ModuleTest
*/
*** 66,81 ****
public void compileAll() throws Exception {
CompilerUtils.cleanDir(MODS_DIR);
CompilerUtils.cleanDir(UNNAMED_DIR);
assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
! "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
// m4 is not referenced
Arrays.asList("m1", "m2", "m3", "m4")
.forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
! assertTrue(CompilerUtils.compile(SRC_DIR.resolve("m3"), UNNAMED_DIR, "-mp", MODS_DIR.toString()));
Files.delete(UNNAMED_DIR.resolve("module-info.class"));
}
@DataProvider(name = "modules")
public Object[][] expected() {
--- 66,81 ----
public void compileAll() throws Exception {
CompilerUtils.cleanDir(MODS_DIR);
CompilerUtils.cleanDir(UNNAMED_DIR);
assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
! "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
// m4 is not referenced
Arrays.asList("m1", "m2", "m3", "m4")
.forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
! assertTrue(CompilerUtils.compile(SRC_DIR.resolve("m3"), UNNAMED_DIR, "-p", MODS_DIR.toString()));
Files.delete(UNNAMED_DIR.resolve("module-info.class"));
}
@DataProvider(name = "modules")
public Object[][] expected() {
*** 110,123 ****
};
}
@Test(dataProvider = "modules")
public void modularTest(String name, ModuleMetaData data) throws IOException {
! // jdeps -modulepath mods -m <name>
runTest(data, MODS_DIR.toString(), Set.of(name));
! // jdeps -modulepath libs/m1.jar:.... -m <name>
String mp = Arrays.stream(modules)
.filter(mn -> !mn.equals(name))
.map(mn -> MODS_DIR.resolve(mn).toString())
.collect(Collectors.joining(File.pathSeparator));
runTest(data, mp, Collections.emptySet(), MODS_DIR.resolve(name));
--- 110,123 ----
};
}
@Test(dataProvider = "modules")
public void modularTest(String name, ModuleMetaData data) throws IOException {
! // jdeps --module-path mods -m <name>
runTest(data, MODS_DIR.toString(), Set.of(name));
! // jdeps --module-path libs/m1.jar:.... -m <name>
String mp = Arrays.stream(modules)
.filter(mn -> !mn.equals(name))
.map(mn -> MODS_DIR.resolve(mn).toString())
.collect(Collectors.joining(File.pathSeparator));
runTest(data, mp, Collections.emptySet(), MODS_DIR.resolve(name));
*** 148,159 ****
private void runTest(ModuleMetaData data, String modulepath,
Set<String> roots, Path... paths)
throws IOException
{
! // jdeps -modulepath <modulepath> -m root paths
! String cmd = String.format("jdeps -modulepath %s -addmods %s %s%n",
MODS_DIR, roots.stream().collect(Collectors.joining(",")), paths);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
jdeps.appModulePath(modulepath)
.addmods(roots);
--- 148,159 ----
private void runTest(ModuleMetaData data, String modulepath,
Set<String> roots, Path... paths)
throws IOException
{
! // jdeps --module-path <modulepath> -m root paths
! String cmd = String.format("jdeps --module-path %s --add-modules %s %s%n",
MODS_DIR, roots.stream().collect(Collectors.joining(",")), paths);
try (JdepsUtil.Command jdeps = JdepsUtil.newCommand(cmd)) {
jdeps.appModulePath(modulepath)
.addmods(roots);
< prev index next >