langtools/test/tools/jdeps/modules/GenModuleInfo.java

*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @summary Tests jdeps -genmoduleinfo option
   * @library ../lib
   * @build CompilerUtils JdepsUtil
   * @modules jdk.jdeps/com.sun.tools.jdeps
   * @run testng GenModuleInfo
   */
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @summary Tests jdeps --gen-module-info option
   * @library ../lib
   * @build CompilerUtils JdepsUtil
   * @modules jdk.jdeps/com.sun.tools.jdeps
   * @run testng GenModuleInfo
   */
*** 71,81 ****
          CompilerUtils.cleanDir(LIBS_DIR);
          CompilerUtils.cleanDir(DEST_DIR);
          CompilerUtils.cleanDir(NEW_MODS_DIR);
  
          assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
!                                                "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
          Arrays.asList("m1", "m2", "m3")
                .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
  
          Files.createDirectory(LIBS_DIR);
          Files.createDirectory(DEST_DIR);
--- 71,81 ----
          CompilerUtils.cleanDir(LIBS_DIR);
          CompilerUtils.cleanDir(DEST_DIR);
          CompilerUtils.cleanDir(NEW_MODS_DIR);
  
          assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED,
!                                                "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
          Arrays.asList("m1", "m2", "m3")
                .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn)));
  
          Files.createDirectory(LIBS_DIR);
          Files.createDirectory(DEST_DIR);
*** 104,114 ****
      public void test() throws IOException {
          Stream<String> files = Arrays.stream(modules)
                  .map(mn -> LIBS_DIR.resolve(mn + ".jar"))
                  .map(Path::toString);
  
!         JdepsUtil.jdeps(Stream.concat(Stream.of("-genmoduleinfo", DEST_DIR.toString()),
                                        files).toArray(String[]::new));
  
          // check file exists
          Arrays.stream(modules)
                  .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java"))
--- 104,114 ----
      public void test() throws IOException {
          Stream<String> files = Arrays.stream(modules)
                  .map(mn -> LIBS_DIR.resolve(mn + ".jar"))
                  .map(Path::toString);
  
!         JdepsUtil.jdeps(Stream.concat(Stream.of("--gen-module-info", DEST_DIR.toString()),
                                        files).toArray(String[]::new));
  
          // check file exists
          Arrays.stream(modules)
                  .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java"))
*** 130,144 ****
                    });
          }
  
          // compile new module-info.java
          assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED,
!                         "-mp", NEW_MODS_DIR.toString(), "-verbose",
!                         "-XaddExports:java.base/jdk.internal.perf=" + UNSUPPORTED));
          Arrays.asList("m1", "m2", "m3")
                .forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR,
!                                         mn, "-mp", NEW_MODS_DIR.toString())));
  
          for (String mn : modules) {
              Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO);
              Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO);
  
--- 130,144 ----
                    });
          }
  
          // compile new module-info.java
          assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED,
!                         "-p", NEW_MODS_DIR.toString(), "-verbose",
!                         "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED));
          Arrays.asList("m1", "m2", "m3")
                .forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR,
!                                         mn, "-p", NEW_MODS_DIR.toString())));
  
          for (String mn : modules) {
              Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO);
              Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO);