test/jdk/tools/jpackage/createappimage/JPackageCreateAppImageVerboseTest.java

*** 26,56 ****
   * @summary jpackage create image verbose test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
   * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageCreateImageVerboseTest
   */
! public class JPackageCreateImageVerboseTest {
      private static final String OUTPUT = "output";
      private static final String[] CMD = {
!         "create-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
!         "--files", "hello.jar"};
  
      private static final String[] CMD_VERBOSE = {
!         "create-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
-         "--files", "hello.jar",
          "--verbose"};
  
      private static void validate(String result, String resultVerbose)
              throws Exception {
          String[] r = result.split("\n");
--- 26,55 ----
   * @summary jpackage create image verbose test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
   * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageCreateAppImageVerboseTest
   */
! public class JPackageCreateAppImageVerboseTest {
      private static final String OUTPUT = "output";
      private static final String[] CMD = {
!         "create-app-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
!     };
  
      private static final String[] CMD_VERBOSE = {
!         "create-app-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
          "--verbose"};
  
      private static void validate(String result, String resultVerbose)
              throws Exception {
          String[] r = result.split("\n");
*** 64,91 ****
              throw new AssertionError(
                      "non-verbose output is less or equal to verbose output");
          }
      }
  
!     private static void testCreateImage() throws Exception {
          String result = JPackageHelper.executeCLI(true, CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String resultVerbose = JPackageHelper.executeCLI(true, CMD_VERBOSE);
          validate(result, resultVerbose);
      }
  
!     private static void testCreateImageToolProvider() throws Exception {
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String result = JPackageHelper.executeToolProvider(true, CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String resultVerbose =
                  JPackageHelper.executeToolProvider(true, CMD_VERBOSE);
          validate(result, resultVerbose);
      }
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloImageJar();
!         testCreateImage();
!         testCreateImageToolProvider();
      }
  
  }
--- 63,90 ----
              throw new AssertionError(
                      "non-verbose output is less or equal to verbose output");
          }
      }
  
!     private static void testCreateAppImage() throws Exception {
          String result = JPackageHelper.executeCLI(true, CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String resultVerbose = JPackageHelper.executeCLI(true, CMD_VERBOSE);
          validate(result, resultVerbose);
      }
  
!     private static void testCreateAppImageToolProvider() throws Exception {
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String result = JPackageHelper.executeToolProvider(true, CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
          String resultVerbose =
                  JPackageHelper.executeToolProvider(true, CMD_VERBOSE);
          validate(result, resultVerbose);
      }
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloImageJar();
!         testCreateAppImage();
!         testCreateAppImageToolProvider();
      }
  
  }