jdk/test/tools/launcher/modules/upgrademodulepath/UpgradeModulePathTest.java

*** 25,35 ****
   * @test
   * @library /lib/testlibrary
   * @modules jdk.compiler
   * @build UpgradeModulePathTest CompilerUtils jdk.testlibrary.*
   * @run testng UpgradeModulePathTest
!  * @summary Basic test for java -upgrademodulepath
   */
  
  import java.io.File;
  import java.nio.file.Path;
  import java.nio.file.Paths;
--- 25,35 ----
   * @test
   * @library /lib/testlibrary
   * @modules jdk.compiler
   * @build UpgradeModulePathTest CompilerUtils jdk.testlibrary.*
   * @run testng UpgradeModulePathTest
!  * @summary Basic test for java --upgrade-module-path
   */
  
  import java.io.File;
  import java.nio.file.Path;
  import java.nio.file.Paths;
*** 63,85 ****
          boolean compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("java.enterprise"),
                  MODS_DIR.resolve("java.enterprise"));
          assertTrue(compiled);
  
!         // javac -d upgrademods/java.transaction -mp mods src/java.transaction/**
          compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("java.transaction"),
                  UPGRADEDMODS_DIR.resolve("java.transaction"),
!                 "-mp", MODS_DIR.toString());
          assertTrue(compiled);
  
!         // javac -d mods -upgrademodulepath upgrademods -mp mods src/test/**
          compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("test"),
                  MODS_DIR.resolve("test"),
!                 "-upgrademodulepath", UPGRADEDMODS_DIR.toString(),
!                 "-mp", MODS_DIR.toString());
          assertTrue(compiled);
  
      }
  
  
--- 63,85 ----
          boolean compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("java.enterprise"),
                  MODS_DIR.resolve("java.enterprise"));
          assertTrue(compiled);
  
!         // javac -d upgrademods/java.transaction --module-path mods src/java.transaction/**
          compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("java.transaction"),
                  UPGRADEDMODS_DIR.resolve("java.transaction"),
!                 "--module-path", MODS_DIR.toString());
          assertTrue(compiled);
  
!         // javac -d mods --upgrade-module-path upgrademods --module-path mods src/test/**
          compiled = CompilerUtils.compile(
                  SRC_DIR.resolve("test"),
                  MODS_DIR.resolve("test"),
!                 "--upgrade-module-path", UPGRADEDMODS_DIR.toString(),
!                 "--module-path", MODS_DIR.toString());
          assertTrue(compiled);
  
      }
  
  
*** 90,101 ****
  
          String mid = "test/jdk.test.Main";
  
          int exitValue
              = executeTestJava(
!                 "-upgrademodulepath", UPGRADEDMODS_DIR.toString(),
!                 "-mp", MODS_DIR.toString(),
                  "-m", mid)
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();
  
--- 90,101 ----
  
          String mid = "test/jdk.test.Main";
  
          int exitValue
              = executeTestJava(
!                 "--upgrade-module-path", UPGRADEDMODS_DIR.toString(),
!                 "--module-path", MODS_DIR.toString(),
                  "-m", mid)
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();
  
*** 114,125 ****
              = "DoesNotExit" + File.pathSeparator + UPGRADEDMODS_DIR.toString();
          String mid = "test/jdk.test.Main";
  
          int exitValue
              = executeTestJava(
!                 "-upgrademodulepath", upgrademodulepath,
!                 "-mp", MODS_DIR.toString(),
                  "-m", mid)
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();
  
--- 114,125 ----
              = "DoesNotExit" + File.pathSeparator + UPGRADEDMODS_DIR.toString();
          String mid = "test/jdk.test.Main";
  
          int exitValue
              = executeTestJava(
!                 "--upgrade-module-path", upgrademodulepath,
!                 "--module-path", MODS_DIR.toString(),
                  "-m", mid)
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();