< prev index next >
jdk/test/tools/jar/modularJar/Basic.java
Print this page
@@ -458,11 +458,11 @@
jar("--update",
"--file=" + modularJar.toString(),
"--no-manifest",
"-C", barModInfo.toString(), "module-info.class") // stuff in bar's info
.assertSuccess();
- jar("-p",
+ jar("-d",
"--file=" + modularJar.toString())
.assertSuccess()
.resultChecker(r -> {
// Expect similar output: "bar, requires mandated foo, ...
// conceals jdk.test.foo, conceals jdk.test.foo.internal"
@@ -497,18 +497,18 @@
modularJar = mp.resolve(FOO.moduleName + ".jar");
jar("--create",
"--file=" + modularJar.toString(),
"--main-class=" + FOO.mainClass,
"--module-version=" + FOO.version,
- "--modulepath=" + mp.toString(),
+ "--module-path=" + mp.toString(),
"--hash-modules=" + "bar",
"--no-manifest",
"-C", modClasses.toString(), ".")
.assertSuccess();
java(mp, BAR.moduleName + "/" + BAR.mainClass,
- "-XaddExports:java.base/jdk.internal.module=bar")
+ "--add-exports", "java.base/jdk.internal.module=bar")
.assertSuccess()
.resultChecker(r -> {
assertModuleData(r, BAR);
TestModuleData received = TestModuleData.from(r.output);
assertTrue(received.hashes != null, "Expected non-null hashes value.");
@@ -533,11 +533,11 @@
Path fooJar = mp.resolve(FOO.moduleName + ".jar");
jar("--create",
"--file=" + fooJar.toString(),
"--main-class=" + FOO.mainClass,
"--module-version=" + FOO.version,
- "--modulepath=" + mp.toString(),
+ "-p", mp.toString(), // test short-form
"--hash-modules=" + "bar",
"--no-manifest",
"-C", fooClasses.toString(), ".").assertSuccess();
// Rebuild bar.jar with a change that will cause its hash to be different
@@ -548,11 +548,11 @@
"--module-version=" + BAR.version + ".1", // a newer version
"--no-manifest",
"-C", barClasses.toString(), ".").assertSuccess();
java(mp, BAR.moduleName + "/" + BAR.mainClass,
- "-XaddExports:java.base/jdk.internal.module=bar")
+ "--add-exports", "java.base/jdk.internal.module=bar")
.assertFailure()
.resultChecker(r -> {
// Expect similar output: "java.lang.module.ResolutionException: Hash
// of bar (WdktSIQSkd4+CEacpOZoeDrCosMATNrIuNub9b5yBeo=) differs to
// expected hash (iepvdv8xTeVrFgMtUhcFnmetSub6qQHCHc92lSaSEg0=)"
@@ -682,11 +682,11 @@
"--module-version=" + FOO.version,
"--no-manifest",
"-C", modClasses.toString(), ".")
.assertSuccess();
- for (String option : new String[] {"--print-module-descriptor", "-p" }) {
+ for (String option : new String[] {"--print-module-descriptor", "-d" }) {
jar(option,
"--file=" + modularJar.toString())
.assertSuccess()
.resultChecker(r ->
assertTrue(r.output.contains(FOO.moduleName + "@" + FOO.version),
@@ -709,11 +709,11 @@
"--module-version=" + FOO.version,
"--no-manifest",
"-C", modClasses.toString(), ".")
.assertSuccess();
- for (String option : new String[] {"--print-module-descriptor", "-p" }) {
+ for (String option : new String[] {"--print-module-descriptor", "-d" }) {
jarWithStdin(modularJar.toFile(),
option)
.assertSuccess()
.resultChecker(r ->
assertTrue(r.output.contains(FOO.moduleName + "@" + FOO.version),
@@ -813,14 +813,16 @@
if (!TOOL_VM_OPTIONS.isEmpty()) {
commands.addAll(Arrays.asList(TOOL_VM_OPTIONS.split("\\s+", -1)));
}
commands.add("-d");
commands.add(dest.toString());
- if (dest.toString().contains("bar"))
- commands.add("-XaddExports:java.base/jdk.internal.module=bar");
+ if (dest.toString().contains("bar")) {
+ commands.add("--add-exports");
+ commands.add("java.base/jdk.internal.module=bar");
+ }
if (modulePath != null) {
- commands.add("-mp");
+ commands.add("--module-path");
commands.add(modulePath.toString());
}
Stream.of(sourceFiles).map(Object::toString).forEach(x -> commands.add(x));
quickFail(run(new ProcessBuilder(commands)));
@@ -836,11 +838,11 @@
}
if (!JAVA_OPTIONS.isEmpty()) {
commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
}
Stream.of(args).forEach(x -> commands.add(x));
- commands.add("-mp");
+ commands.add("--module-path");
commands.add(modulePath.toString());
commands.add("-m");
commands.add(entryPoint);
return run(new ProcessBuilder(commands));
< prev index next >