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

*** 25,68 ****
   * @test
   * @summary jpackage create image modular jar test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @build JPackageCreateImageBase
   * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageCreateImageModularJarTest
   */
! public class JPackageCreateImageModularJarTest {
      private static final String OUTPUT = "output";
  
      private static final String [] CMD1 = {
!         "create-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "com.hello.jar",
          "--main-class", "com.hello.Hello",
-         "--files", "com.hello.jar",
      };
  
      private static final String [] CMD2 = {
!         "create-image",
          "--output", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input/com.hello.jar",
      };
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloModule();
  
!         JPackageCreateImageBase.testCreateImage(CMD1);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateImageBase.testCreateImageToolProvider(CMD1);
  
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateImageBase.testCreateImage(CMD2);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateImageBase.testCreateImageToolProvider(CMD2);
      }
  
  }
--- 25,67 ----
   * @test
   * @summary jpackage create image modular jar test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @build JPackageCreateAppImageBase
   * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageCreateAppImageModularJarTest
   */
! public class JPackageCreateAppImageModularJarTest {
      private static final String OUTPUT = "output";
  
      private static final String [] CMD1 = {
!         "create-app-image",
          "--input", "input",
          "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "com.hello.jar",
          "--main-class", "com.hello.Hello",
      };
  
      private static final String [] CMD2 = {
!         "create-app-image",
          "--output", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input/com.hello.jar",
      };
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloModule();
  
!         JPackageCreateAppImageBase.testCreateAppImage(CMD1);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageBase.testCreateAppImageToolProvider(CMD1);
  
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageBase.testCreateAppImage(CMD2);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageBase.testCreateAppImageToolProvider(CMD2);
      }
  
  }