test/jdk/tools/jpackage/createimage/JPackageCreateImageModularJarTest.java

*** 30,66 ****
   * @build JPackageCreateImageBase
   * @modules jdk.jpackage
   * @run main/othervm -Xmx512m JPackageCreateImageModularJarTest
   */
  public class JPackageCreateImageModularJarTest {
  
      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",
-         "--overwrite"
      };
  
      private static final String [] CMD2 = {
          "create-image",
!         "--output", "output",
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input/com.hello.jar",
-         "--overwrite"
      };
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloModule();
  
          JPackageCreateImageBase.testCreateImage(CMD1);
          JPackageCreateImageBase.testCreateImageToolProvider(CMD1);
  
          JPackageCreateImageBase.testCreateImage(CMD2);
          JPackageCreateImageBase.testCreateImageToolProvider(CMD2);
      }
  
  }
--- 30,68 ----
   * @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);
      }
  
  }