jdk/test/tools/launcher/modules/limitmods/LimitModsTest.java

*** 25,35 ****
   * @test
   * @library /lib/testlibrary
   * @modules java.desktop java.compact1 jdk.compiler
   * @build LimitModsTest CompilerUtils jdk.testlibrary.*
   * @run testng LimitModsTest
!  * @summary Basic tests for java -limitmods
   */
  
  import java.nio.file.Path;
  import java.nio.file.Paths;
  
--- 25,35 ----
   * @test
   * @library /lib/testlibrary
   * @modules java.desktop java.compact1 jdk.compiler
   * @build LimitModsTest CompilerUtils jdk.testlibrary.*
   * @run testng LimitModsTest
!  * @summary Basic tests for java --limit-modules
   */
  
  import java.nio.file.Path;
  import java.nio.file.Paths;
  
*** 64,92 ****
          assertTrue(compiled, "test module did not compile");
      }
  
  
      /**
!      * Basic test of -limitmods to limit which platform modules are observable.
       */
      public void testLimitingPlatformModules() throws Exception {
          int exitValue;
  
!         // java -limitmods java.base -listmods
!         exitValue = executeTestJava("-limitmods", "java.base", "-listmods")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldNotContain("java.logging")
              .shouldNotContain("java.xml")
              .getExitValue();
  
          assertTrue(exitValue == 0);
  
  
!         // java -limitmods java.compact1 -listmods
!         exitValue = executeTestJava("-limitmods", "java.compact1", "-listmods")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldContain("java.logging")
              .shouldContain("java.compact1")
--- 64,92 ----
          assertTrue(compiled, "test module did not compile");
      }
  
  
      /**
!      * Basic test of --limit-modules to limit which platform modules are observable.
       */
      public void testLimitingPlatformModules() throws Exception {
          int exitValue;
  
!         // java --limit-modules java.base --list-modules
!         exitValue = executeTestJava("--limit-modules", "java.base", "--list-modules")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldNotContain("java.logging")
              .shouldNotContain("java.xml")
              .getExitValue();
  
          assertTrue(exitValue == 0);
  
  
!         // java --limit-modules java.compact1 --list-modules
!         exitValue = executeTestJava("--limit-modules", "java.compact1", "--list-modules")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldContain("java.logging")
              .shouldContain("java.compact1")
*** 96,159 ****
          assertTrue(exitValue == 0);
      }
  
  
      /**
!      * Test -limitmods with -addmods
       */
      public void testWithAddMods() throws Exception {
          int exitValue;
  
!         // java -limitmods java.base -addmods java.logging -listmods
!         exitValue = executeTestJava("-limitmods", "java.base",
!                                     "-addmods", "java.logging",
!                                     "-listmods")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldContain("java.logging")
              .shouldNotContain("java.xml")
              .getExitValue();
  
          assertTrue(exitValue == 0);
  
  
!         // java -limitmods java.base -addmods java.sql -listmods
          // This should fail because java.sql has dependences beyond java.base
!         exitValue = executeTestJava("-limitmods", "java.base",
!                                     "-addmods", "java.sql",
!                                     "-listmods")
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();
  
          assertTrue(exitValue != 0);
      }
  
  
      /**
!      * Run class path application with -limitmods
       */
      public void testUnnamedModule() throws Exception {
          String classpath = MODS_DIR.resolve(TEST_MODULE).toString();
  
!         // java -limitmods java.base -cp mods/$TESTMODULE ...
          int exitValue1
!             = executeTestJava("-limitmods", "java.base",
                                "-cp", classpath,
                                MAIN_CLASS)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .shouldContain("NoClassDefFoundError")
                  .getExitValue();
  
          assertTrue(exitValue1 != 0);
  
  
!         // java -limitmods java.base -cp mods/$TESTMODULE ...
          int exitValue2
!             = executeTestJava("-limitmods", "java.desktop",
                                "-cp", classpath,
                               MAIN_CLASS)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();
--- 96,159 ----
          assertTrue(exitValue == 0);
      }
  
  
      /**
!      * Test --limit-modules with --add-modules
       */
      public void testWithAddMods() throws Exception {
          int exitValue;
  
!         // java --limit-modules java.base --add-modules java.logging --list-modules
!         exitValue = executeTestJava("--limit-modules", "java.base",
!                                     "--add-modules", "java.logging",
!                                     "--list-modules")
              .outputTo(System.out)
              .errorTo(System.out)
              .shouldContain("java.base")
              .shouldContain("java.logging")
              .shouldNotContain("java.xml")
              .getExitValue();
  
          assertTrue(exitValue == 0);
  
  
!         // java --limit-modules java.base --add-modules java.sql --list-modules
          // This should fail because java.sql has dependences beyond java.base
!         exitValue = executeTestJava("--limit-modules", "java.base",
!                                     "--add-modules", "java.sql",
!                                     "--list-modules")
              .outputTo(System.out)
              .errorTo(System.out)
              .getExitValue();
  
          assertTrue(exitValue != 0);
      }
  
  
      /**
!      * Run class path application with --limit-modules
       */
      public void testUnnamedModule() throws Exception {
          String classpath = MODS_DIR.resolve(TEST_MODULE).toString();
  
!         // java --limit-modules java.base -cp mods/$TESTMODULE ...
          int exitValue1
!             = executeTestJava("--limit-modules", "java.base",
                                "-cp", classpath,
                                MAIN_CLASS)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .shouldContain("NoClassDefFoundError")
                  .getExitValue();
  
          assertTrue(exitValue1 != 0);
  
  
!         // java --limit-modules java.base -cp mods/$TESTMODULE ...
          int exitValue2
!             = executeTestJava("--limit-modules", "java.desktop",
                                "-cp", classpath,
                               MAIN_CLASS)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();
*** 161,190 ****
          assertTrue(exitValue2 == 0);
      }
  
  
      /**
!      * Run named module with -limitmods
       */
      public void testNamedModule() throws Exception {
  
          String modulepath = MODS_DIR.toString();
          String mid = TEST_MODULE + "/" + MAIN_CLASS;
  
!         // java -limitmods java.base -mp mods -m $TESTMODULE/$MAINCLASS
!         int exitValue = executeTestJava("-limitmods", "java.base",
!                                         "-mp", modulepath,
                                          "-m", mid)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();
  
          assertTrue(exitValue != 0);
  
!         // java -limitmods java.desktop -mp mods -m $TESTMODULE/$MAINCLASS
!         exitValue = executeTestJava("-limitmods", "java.desktop",
!                                     "-mp", modulepath,
                                      "-m", mid)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();
  
--- 161,190 ----
          assertTrue(exitValue2 == 0);
      }
  
  
      /**
!      * Run named module with --limit-modules
       */
      public void testNamedModule() throws Exception {
  
          String modulepath = MODS_DIR.toString();
          String mid = TEST_MODULE + "/" + MAIN_CLASS;
  
!         // java --limit-modules java.base --module-path mods -m $TESTMODULE/$MAINCLASS
!         int exitValue = executeTestJava("--limit-modules", "java.base",
!                                         "--module-path", modulepath,
                                          "-m", mid)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();
  
          assertTrue(exitValue != 0);
  
!         // java --limit-modules java.desktop --module-path mods -m $TESTMODULE/$MAINCLASS
!         exitValue = executeTestJava("--limit-modules", "java.desktop",
!                                     "--module-path", modulepath,
                                      "-m", mid)
                  .outputTo(System.out)
                  .errorTo(System.out)
                  .getExitValue();