jdk/test/tools/jar/modularJar/Basic.java

*** 458,468 ****
          jar("--update",
              "--file=" + modularJar.toString(),
              "--no-manifest",
              "-C", barModInfo.toString(), "module-info.class")  // stuff in bar's info
              .assertSuccess();
!         jar("-p",
              "--file=" + modularJar.toString())
              .assertSuccess()
              .resultChecker(r -> {
                  // Expect similar output: "bar, requires mandated foo, ...
                  // conceals jdk.test.foo, conceals jdk.test.foo.internal"
--- 458,468 ----
          jar("--update",
              "--file=" + modularJar.toString(),
              "--no-manifest",
              "-C", barModInfo.toString(), "module-info.class")  // stuff in bar's info
              .assertSuccess();
!         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,514 ****
          modularJar = mp.resolve(FOO.moduleName + ".jar");
          jar("--create",
              "--file=" + modularJar.toString(),
              "--main-class=" + FOO.mainClass,
              "--module-version=" + FOO.version,
!             "--modulepath=" + mp.toString(),
              "--hash-modules=" + "bar",
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
          java(mp, BAR.moduleName + "/" + BAR.mainClass,
!              "-XaddExports: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.");
--- 497,514 ----
          modularJar = mp.resolve(FOO.moduleName + ".jar");
          jar("--create",
              "--file=" + modularJar.toString(),
              "--main-class=" + FOO.mainClass,
              "--module-version=" + FOO.version,
!             "--module-path=" + mp.toString(),
              "--hash-modules=" + "bar",
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
          java(mp, BAR.moduleName + "/" + BAR.mainClass,
!              "--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,543 ****
          Path fooJar = mp.resolve(FOO.moduleName + ".jar");
          jar("--create",
              "--file=" + fooJar.toString(),
              "--main-class=" + FOO.mainClass,
              "--module-version=" + FOO.version,
!             "--modulepath=" + mp.toString(),
              "--hash-modules=" + "bar",
              "--no-manifest",
              "-C", fooClasses.toString(), ".").assertSuccess();
  
          // Rebuild bar.jar with a change that will cause its hash to be different
--- 533,543 ----
          Path fooJar = mp.resolve(FOO.moduleName + ".jar");
          jar("--create",
              "--file=" + fooJar.toString(),
              "--main-class=" + FOO.mainClass,
              "--module-version=" + FOO.version,
!             "-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,558 ****
              "--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")
              .assertFailure()
              .resultChecker(r -> {
                  // Expect similar output: "java.lang.module.ResolutionException: Hash
                  // of bar (WdktSIQSkd4+CEacpOZoeDrCosMATNrIuNub9b5yBeo=) differs to
                  // expected hash (iepvdv8xTeVrFgMtUhcFnmetSub6qQHCHc92lSaSEg0=)"
--- 548,558 ----
              "--module-version=" + BAR.version + ".1", // a newer version
              "--no-manifest",
              "-C", barClasses.toString(), ".").assertSuccess();
  
          java(mp, BAR.moduleName + "/" + BAR.mainClass,
!              "--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,692 ****
              "--module-version=" + FOO.version,
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
!         for (String option : new String[]  {"--print-module-descriptor", "-p" }) {
              jar(option,
                  "--file=" + modularJar.toString())
                  .assertSuccess()
                  .resultChecker(r ->
                      assertTrue(r.output.contains(FOO.moduleName + "@" + FOO.version),
--- 682,692 ----
              "--module-version=" + FOO.version,
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
!         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,719 ****
              "--module-version=" + FOO.version,
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
!         for (String option : new String[]  {"--print-module-descriptor", "-p" }) {
              jarWithStdin(modularJar.toFile(),
                           option)
                           .assertSuccess()
                           .resultChecker(r ->
                               assertTrue(r.output.contains(FOO.moduleName + "@" + FOO.version),
--- 709,719 ----
              "--module-version=" + FOO.version,
              "--no-manifest",
              "-C", modClasses.toString(), ".")
              .assertSuccess();
  
!         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,826 ****
          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 (modulePath != null) {
!             commands.add("-mp");
              commands.add(modulePath.toString());
          }
          Stream.of(sourceFiles).map(Object::toString).forEach(x -> commands.add(x));
  
          quickFail(run(new ProcessBuilder(commands)));
--- 813,828 ----
          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("--add-exports");
!             commands.add("java.base/jdk.internal.module=bar");
!         }
          if (modulePath != null) {
!             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,846 ****
          }
          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(modulePath.toString());
          commands.add("-m");
          commands.add(entryPoint);
  
          return run(new ProcessBuilder(commands));
--- 838,848 ----
          }
          if (!JAVA_OPTIONS.isEmpty()) {
              commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
          }
          Stream.of(args).forEach(x -> commands.add(x));
!         commands.add("--module-path");
          commands.add(modulePath.toString());
          commands.add("-m");
          commands.add(entryPoint);
  
          return run(new ProcessBuilder(commands));