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

*** 32,55 ****
   * @build JPackagePath
   * @modules jdk.jpackage
   * @run main/othervm -Xmx512m JPackageCreateImageIconTest
   */
  public class JPackageCreateImageIconTest {
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
      private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
  
      private static final String[] CMD = {
          "create-image",
          "--input", "input",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
-         "--overwrite",
          "--files", "hello.jar",
          "--icon", getIconPath(),
!         "--output", "output"};
  
      private static void validateResult(String[] result) throws Exception {
          if (result.length != 2) {
              throw new AssertionError(
                     "Unexpected number of lines: " + result.length);
--- 32,55 ----
   * @build JPackagePath
   * @modules jdk.jpackage
   * @run main/othervm -Xmx512m JPackageCreateImageIconTest
   */
  public class JPackageCreateImageIconTest {
+     private static final String OUTPUT = "output";
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
      private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
  
      private static final String[] CMD = {
          "create-image",
          "--input", "input",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
          "--files", "hello.jar",
          "--icon", getIconPath(),
!         "--output", OUTPUT};
  
      private static void validateResult(String[] result) throws Exception {
          if (result.length != 2) {
              throw new AssertionError(
                     "Unexpected number of lines: " + result.length);
*** 96,105 ****
--- 96,106 ----
          validate();
          validateIcon();
      }
  
      private static void testIconToolProvider() throws Exception {
+         JPackageHelper.deleteOutputFolder(OUTPUT);
          JPackageHelper.executeToolProvider(true, CMD);
          validate();
          validateIcon();
      }