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

*** 32,64 ****
   * @build JPackagePath
   * @modules jdk.jpackage
   * @run main/othervm -Xmx512m JPackageCreateImageBuildRootTest
   */
  public class JPackageCreateImageBuildRootTest {
      private static String buildRoot = null;
      private static final String BUILD_ROOT = "buildRoot";
      private static final String BUILD_ROOT_TB = "buildRootToolProvider";
  
      private static final String [] CMD = {
          "create-image",
          "--input", "input",
!         "--output", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
!         "--files", "hello.jar",
!         "--overwrite" };
  
      private static final String [] CMD_BUILD_ROOT = {
          "create-image",
          "--input", "input",
!         "--output", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
          "--files", "hello.jar",
-         "--overwrite",
          "--build-root", "TBD"};
  
      private static void validate(boolean retain) throws Exception {
          File br = new File(buildRoot);
          if (retain) {
--- 32,63 ----
   * @build JPackagePath
   * @modules jdk.jpackage
   * @run main/othervm -Xmx512m JPackageCreateImageBuildRootTest
   */
  public class JPackageCreateImageBuildRootTest {
+     private static final String OUTPUT = "output";
      private static String buildRoot = null;
      private static final String BUILD_ROOT = "buildRoot";
      private static final String BUILD_ROOT_TB = "buildRootToolProvider";
  
      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_BUILD_ROOT = {
          "create-image",
          "--input", "input",
!         "--output", OUTPUT,
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
          "--files", "hello.jar",
          "--build-root", "TBD"};
  
      private static void validate(boolean retain) throws Exception {
          File br = new File(buildRoot);
          if (retain) {
*** 84,101 ****
--- 83,103 ----
  
      private static void testBuildRoot() throws Exception {
          init(false);
          JPackageHelper.executeCLI(true, CMD);
          validate(false);
+         JPackageHelper.deleteOutputFolder(OUTPUT);
          JPackageHelper.executeCLI(true, CMD_BUILD_ROOT);
          validate(true);
      }
  
      private static void testBuildRootToolProvider() throws Exception {
          init(true);
+         JPackageHelper.deleteOutputFolder(OUTPUT);
          JPackageHelper.executeToolProvider(true, CMD);
          validate(false);
+         JPackageHelper.deleteOutputFolder(OUTPUT);
          JPackageHelper.executeToolProvider(true, CMD_BUILD_ROOT);
          validate(true);
      }
  
      public static void main(String[] args) throws Exception {