--- old/test/jdk/tools/jpackage/JPackageInvalidArgTest.java 2019-02-28 20:46:40.856151400 -0800 +++ new/test/jdk/tools/jpackage/JPackageInvalidArgTest.java 2019-02-28 20:46:39.533019100 -0800 @@ -33,7 +33,7 @@ public class JPackageInvalidArgTest { private static final String ARG1 = "--no-such-argument"; - private static final String ARG2 = "--overwrite"; + private static final String ARG2 = "--output"; private static final String RESULT1 = "Invalid Option: [--no-such-argument]"; private static final String RESULT2 = "Mode is not specified"; --- old/test/jdk/tools/jpackage/JPackageMissingArgumentsTest.java 2019-02-28 20:46:46.898755600 -0800 +++ new/test/jdk/tools/jpackage/JPackageMissingArgumentsTest.java 2019-02-28 20:46:45.615627300 -0800 @@ -39,7 +39,6 @@ "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_2 = {"--input"}; @@ -49,7 +48,6 @@ "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_3 = {"--input", "--app-image"}; @@ -59,7 +57,6 @@ "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_4 = {"--main-class"}; @@ -69,7 +66,6 @@ "--output", "output", "--name", "test", "--main-jar", "hello.jar", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_5 = {"--main-jar"}; @@ -79,7 +75,6 @@ "--output", "output", "--name", "test", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_6 = {"--module-path", "--runtime-image"}; @@ -88,7 +83,6 @@ "--output", "output", "--name", "test", "--module", "com.hello/com.hello.Hello", - "--overwrite", "--files", "hello.jar"}; private static final String [] RESULT_7 = {"--module-path", "--runtime-image", @@ -98,7 +92,6 @@ "--output", "output", "--name", "test", "--module", "com.hello/com.hello.Hello", - "--overwrite", "--files", "hello.jar"}; private static void validate(String output, String [] expected) --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageArgumentsModuleTest.java 2019-02-28 20:46:53.034369100 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageArgumentsModuleTest.java 2019-02-28 20:46:51.683234000 -0800 @@ -32,12 +32,12 @@ * @run main/othervm -Xmx512m JPackageCreateImageArgumentsModuleTest */ public class JPackageCreateImageArgumentsModuleTest { + private static final String OUTPUT = "output"; private static final String[] CMD = { "create-image", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--module", "com.hello/com.hello.Hello", "--module-path", "input", "--arguments", "TBD"}; @@ -45,6 +45,7 @@ public static void main(String[] args) throws Exception { JPackageHelper.createHelloModule(); JPackageCreateImageArgumentsBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageArgumentsBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageArgumentsTest.java 2019-02-28 20:46:59.158981500 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageArgumentsTest.java 2019-02-28 20:46:57.872852900 -0800 @@ -32,21 +32,22 @@ * @run main/othervm -Xmx512m JPackageCreateImageArgumentsTest */ public class JPackageCreateImageArgumentsTest { + private static final String OUTPUT = "output"; private static final String[] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--arguments", "TBD"}; public static void main(String[] args) throws Exception { JPackageHelper.createHelloImageJar(); JPackageCreateImageArgumentsBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageArgumentsBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java 2019-02-28 20:47:05.188584400 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageBuildRootTest.java 2019-02-28 20:47:03.898455400 -0800 @@ -34,6 +34,7 @@ * @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"; @@ -41,22 +42,20 @@ private static final String [] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--files", "hello.jar", - "--overwrite" }; + "--files", "hello.jar" }; private static final String [] CMD_BUILD_ROOT = { "create-image", "--input", "input", - "--output", "output", + "--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 { @@ -86,14 +85,17 @@ 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); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageIconTest.java 2019-02-28 20:47:11.244189900 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageIconTest.java 2019-02-28 20:47:09.957061200 -0800 @@ -34,6 +34,7 @@ * @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(); @@ -44,10 +45,9 @@ "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--icon", getIconPath(), - "--output", "output"}; + "--output", OUTPUT}; private static void validateResult(String[] result) throws Exception { if (result.length != 2) { @@ -98,6 +98,7 @@ } private static void testIconToolProvider() throws Exception { + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD); validate(); validateIcon(); --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageInputFilesTest.java 2019-02-28 20:47:17.295795000 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageInputFilesTest.java 2019-02-28 20:47:16.008666300 -0800 @@ -36,6 +36,7 @@ * @run main/othervm -Xmx512m JPackageCreateImageInputFilesTest */ public class JPackageCreateImageInputFilesTest { + private static final String OUTPUT = "output"; private static final String inputFile = "input" + File.separator + "input.txt"; private static final String jarFile = @@ -51,20 +52,18 @@ private static final String [] CMD_1 = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", - "--overwrite", "--main-class", "Hello"}; private static final String [] CMD_2 = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static void validate1() throws Exception { @@ -99,14 +98,17 @@ JPackageHelper.executeCLI(true, CMD_1); validate1(); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeCLI(true, CMD_2); validate2(); } private static void testCreateImageToolProvider() throws Exception { + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD_1); validate1(); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD_2); validate2(); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsModuleTest.java 2019-02-28 20:47:23.357401100 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsModuleTest.java 2019-02-28 20:47:22.049270300 -0800 @@ -32,21 +32,20 @@ * @run main/othervm -Xmx512m JPackageCreateImageJVMArgsModuleTest */ public class JPackageCreateImageJVMArgsModuleTest { + private static final String OUTPUT = "output"; private static final String[] CMD = { "create-image", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--module", "com.hello/com.hello.Hello", "--module-path", "input", "--jvm-args", "TBD"}; private static final String[] CMD2 = { "create-image", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--module", "com.hello/com.hello.Hello", "--module-path", "input", "--jvm-args", "TBD", @@ -57,9 +56,12 @@ JPackageHelper.createHelloModule(); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgsToolProvider(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs2(CMD2); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs2ToolProvider(CMD2); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsTest.java 2019-02-28 20:47:29.389004200 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageJVMArgsTest.java 2019-02-28 20:47:28.099875300 -0800 @@ -32,27 +32,26 @@ * @run main/othervm -Xmx512m JPackageCreateImageJVMArgsTest */ public class JPackageCreateImageJVMArgsTest { + private static final String OUTPUT = "output"; private static final String[] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--jvm-args", "TBD"}; private static final String[] CMD2 = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--jvm-args", "TBD", "--jvm-args", "TBD", "--jvm-args", "TBD"}; @@ -60,9 +59,12 @@ public static void main(String[] args) throws Exception { JPackageHelper.createHelloImageJar(); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgsToolProvider(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs2(CMD2); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageJVMArgsBase.testCreateImageJVMArgs2ToolProvider(CMD2); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageMainClassAttributeTest.java 2019-02-28 20:47:35.420607300 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageMainClassAttributeTest.java 2019-02-28 20:47:34.136478900 -0800 @@ -34,6 +34,7 @@ * @run main/othervm -Xmx512m JPackageCreateImageMainClassAttributeTest */ public class JPackageCreateImageMainClassAttributeTest { + 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(); @@ -41,10 +42,9 @@ private static final String[] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", - "--overwrite", "--files", "hello.jar"}; private static void validateResult(String[] result) throws Exception { @@ -85,6 +85,7 @@ } private static void testMainClassAttributeToolProvider() throws Exception { + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD); validate(); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageModularJarTest.java 2019-02-28 20:47:41.446209800 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageModularJarTest.java 2019-02-28 20:47:40.163081500 -0800 @@ -32,34 +32,36 @@ * @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", + "--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", + "--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); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageBase.testCreateImageToolProvider(CMD1); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageBase.testCreateImage(CMD2); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageBase.testCreateImageToolProvider(CMD2); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageModuleTest.java 2019-02-28 20:47:47.477812900 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageModuleTest.java 2019-02-28 20:47:46.191684300 -0800 @@ -32,17 +32,19 @@ * @run main/othervm -Xmx512m JPackageCreateImageModuleTest */ public class JPackageCreateImageModuleTest { + private static final String OUTPUT = "output"; + private static final String [] CMD = { "create-image", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--module", "com.hello/com.hello.Hello", "--module-path", "input"}; public static void main(String[] args) throws Exception { JPackageHelper.createHelloModule(); JPackageCreateImageBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageNoNameTest.java 2019-02-28 20:47:53.486413700 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageNoNameTest.java 2019-02-28 20:47:52.202285300 -0800 @@ -34,6 +34,7 @@ * @run main/othervm -Xmx512m JPackageCreateImageNoNameTest */ public class JPackageCreateImageNoNameTest { + private static final String OUTPUT = "output"; private static final String app = JPackagePath.getAppNoName(); private static final String appOutput = JPackagePath.getAppOutputFile(); private static final String appWorkingDir = JPackagePath.getAppWorkingDirNoName(); @@ -41,10 +42,9 @@ private static final String[] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static void validateResult(String[] result) throws Exception { @@ -85,6 +85,7 @@ } private static void testMainClassAttributeToolProvider() throws Exception { + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD); validate(); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageRuntimeModuleTest.java 2019-02-28 20:47:59.498014800 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageRuntimeModuleTest.java 2019-02-28 20:47:58.216886700 -0800 @@ -32,12 +32,12 @@ * @run main/othervm -Xmx512m JPackageCreateImageRuntimeModuleTest */ public class JPackageCreateImageRuntimeModuleTest { + private static final String OUTPUT = "output"; private static final String [] CMD = { "create-image", "--runtime-image", "runtime", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--win-console", "--module", "com.hello/com.hello.Hello", "--module-path", "input"}; @@ -46,6 +46,7 @@ JPackageHelper.createHelloModule(); JPackageHelper.createRuntime(); JPackageCreateImageRuntimeBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageRuntimeBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageRuntimeTest.java 2019-02-28 20:48:05.534618400 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageRuntimeTest.java 2019-02-28 20:48:04.230488000 -0800 @@ -32,21 +32,22 @@ * @run main/othervm -Xmx512m JPackageCreateImageRuntimeTest */ public class JPackageCreateImageRuntimeTest { + private static final String OUTPUT = "output"; private static final String [] CMD = { "create-image", "--runtime-image", "runtime", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; public static void main(String[] args) throws Exception { JPackageHelper.createHelloImageJar(); JPackageHelper.createRuntime(); JPackageCreateImageRuntimeBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageRuntimeBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherModuleTest.java 2019-02-28 20:48:11.556220500 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherModuleTest.java 2019-02-28 20:48:10.274092300 -0800 @@ -32,11 +32,11 @@ * @run main/othervm -Xmx512m JPackageCreateImageSecondaryLauncherModuleTest */ public class JPackageCreateImageSecondaryLauncherModuleTest { + private static final String OUTPUT = "output"; private static final String [] CMD = { "create-image", - "--output", "output", + "--output", OUTPUT, "--name", "test", - "--overwrite", "--module", "com.hello/com.hello.Hello", "--module-path", "input", "--secondary-launcher", "sl.properties"}; @@ -45,6 +45,7 @@ JPackageHelper.createHelloModule(); JPackageCreateImageSecondaryLauncherBase.createSLProperties(); JPackageCreateImageSecondaryLauncherBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageSecondaryLauncherBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherTest.java 2019-02-28 20:48:17.582823100 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageSecondaryLauncherTest.java 2019-02-28 20:48:16.298694700 -0800 @@ -32,21 +32,22 @@ * @run main/othervm -Xmx512m JPackageCreateImageSecondaryLauncherTest */ public class JPackageCreateImageSecondaryLauncherTest { + private static final String OUTPUT = "output"; private static final String [] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--secondary-launcher", "sl.properties"}; public static void main(String[] args) throws Exception { JPackageHelper.createHelloImageJar(); JPackageCreateImageSecondaryLauncherBase.createSLProperties(); JPackageCreateImageSecondaryLauncherBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageSecondaryLauncherBase.testCreateImageToolProvider(CMD); } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageTest.java 2019-02-28 20:48:23.602425000 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageTest.java 2019-02-28 20:48:22.319296700 -0800 @@ -32,19 +32,21 @@ * @run main/othervm -Xmx512m JPackageCreateImageTest */ public class JPackageCreateImageTest { + private static final String OUTPUT = "output"; + private static final String [] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; public static void main(String[] args) throws Exception { JPackageHelper.createHelloImageJar(); JPackageCreateImageBase.testCreateImage(CMD); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageCreateImageBase.testCreateImageToolProvider(CMD); } } --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageVerboseTest.java 2019-02-28 20:48:29.617026400 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageVerboseTest.java 2019-02-28 20:48:28.334898200 -0800 @@ -31,26 +31,24 @@ * @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", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String[] CMD_VERBOSE = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--verbose"}; private static void validate(String result, String resultVerbose) @@ -70,12 +68,15 @@ 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); --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageVersionTest.java 2019-02-28 20:48:35.642628900 -0800 +++ new/test/jdk/tools/jpackage/createimage/JPackageCreateImageVersionTest.java 2019-02-28 20:48:34.354500100 -0800 @@ -35,6 +35,7 @@ * @run main/othervm -Xmx512m JPackageCreateImageVersionTest */ public class JPackageCreateImageVersionTest { + private static final String OUTPUT = "output"; private static final String appCfg = JPackagePath.getAppCfg(); private static final String VERSION = "2.3"; private static final String VERSION_DEFAULT = "1.0"; @@ -42,22 +43,20 @@ private static final String[] CMD = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; private static final String[] CMD_VERSION = { "create-image", "--input", "input", - "--output", "output", + "--output", OUTPUT, "--name", "test", "--main-jar", "hello.jar", "--main-class", "Hello", "--files", "hello.jar", - "--overwrite", "--app-version", VERSION}; private static void validate(String version) @@ -82,13 +81,16 @@ private static void testVersion() throws Exception { JPackageHelper.executeCLI(true, CMD); validate(null); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeCLI(true, CMD_VERSION); validate(VERSION); } private static void testVersionToolProvider() throws Exception { + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD); validate(null); + JPackageHelper.deleteOutputFolder(OUTPUT); JPackageHelper.executeToolProvider(true, CMD_VERSION); validate(VERSION); } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBase.java 2019-02-28 20:48:41.681232700 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBase.java 2019-02-28 20:48:40.398104400 -0800 @@ -73,7 +73,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBundleNameBase.java 2019-02-28 20:48:47.735838100 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerBundleNameBase.java 2019-02-28 20:48:46.451709700 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--linux-bundle-name", BUNDLE_NAME}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:48:53.775442000 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:48:52.488313300 -0800 @@ -137,7 +137,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--file-associations", "fa.properties"}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerInstallDirBase.java 2019-02-28 20:48:59.795043900 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerInstallDirBase.java 2019-02-28 20:48:58.508915300 -0800 @@ -79,7 +79,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--install-dir", "/opt/jpackage"}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:49:05.836648000 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:49:04.544518800 -0800 @@ -74,7 +74,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--license-file", JPackagePath.getLicenseFilePath()}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseTypeBase.java 2019-02-28 20:49:11.850249300 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerLicenseTypeBase.java 2019-02-28 20:49:10.566120900 -0800 @@ -96,7 +96,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--linux-rpm-license-type", JP_LICENSE_TYPE}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerMaintainerBase.java 2019-02-28 20:49:17.879852200 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerMaintainerBase.java 2019-02-28 20:49:16.587723000 -0800 @@ -86,13 +86,12 @@ OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT; CMD = new String[]{ "create-installer", - EXT, + "--installer-type", EXT, "--input", "input", "--output", "output", "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--linux-deb-maintainer", EMAIL}; } --- old/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerPackageDepsBase.java 2019-02-28 20:49:23.923456500 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/linux/base/JPackageCreateInstallerPackageDepsBase.java 2019-02-28 20:49:22.620326200 -0800 @@ -120,7 +120,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--linux-package-deps", DEP_NAME.toLowerCase()}; CMD_DEP = new String[]{ @@ -131,7 +130,6 @@ "--name", DEP_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; } --- old/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerBase.java 2019-02-28 20:49:29.953059400 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerBase.java 2019-02-28 20:49:28.667930900 -0800 @@ -67,7 +67,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; } --- old/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:49:35.983662400 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:49:34.694533500 -0800 @@ -131,7 +131,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--file-associations", "fa.properties"}; } --- old/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerInstallDirBase.java 2019-02-28 20:49:42.011265100 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerInstallDirBase.java 2019-02-28 20:49:40.729136900 -0800 @@ -67,7 +67,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--install-dir", "/Applications/jpackage"}; } --- old/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:49:48.054869400 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/macosx/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:49:46.768740800 -0800 @@ -68,7 +68,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--license-file", JPackagePath.getLicenseFilePath()}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerBase.java 2019-02-28 20:49:54.100473900 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerBase.java 2019-02-28 20:49:52.811345000 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar"}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:50:00.123076100 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerFileAssociationsBase.java 2019-02-28 20:49:58.838947700 -0800 @@ -149,7 +149,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--file-associations", "fa.properties"}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:50:06.165680300 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerLicenseBase.java 2019-02-28 20:50:04.876551400 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--license-file", JPackagePath.getLicenseFilePath()}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinDirChooserBase.java 2019-02-28 20:50:12.200283700 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinDirChooserBase.java 2019-02-28 20:50:10.904154100 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--win-dir-chooser"}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuBase.java 2019-02-28 20:50:18.243888000 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuBase.java 2019-02-28 20:50:16.942757900 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--win-menu"}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuGroupBase.java 2019-02-28 20:50:24.257489300 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinMenuGroupBase.java 2019-02-28 20:50:22.980361600 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--win-menu", "--win-menu-group", TEST_NAME}; --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinPerUserInstallBase.java 2019-02-28 20:50:30.280091500 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinPerUserInstallBase.java 2019-02-28 20:50:28.997963300 -0800 @@ -75,7 +75,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--win-per-user-install", "--win-menu", --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinRegistryNameBase.java 2019-02-28 20:50:36.313694800 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinRegistryNameBase.java 2019-02-28 20:50:35.017565200 -0800 @@ -151,7 +151,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--file-associations", "fa.properties", "--win-registry-name", WIN_REGISTRY_NAME}; --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinShortcutBase.java 2019-02-28 20:50:42.353298700 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinShortcutBase.java 2019-02-28 20:50:41.069170300 -0800 @@ -81,7 +81,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar", "--win-shortcut"}; } --- old/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinUpgradeUUIDBase.java 2019-02-28 20:50:48.405903900 -0800 +++ new/test/jdk/tools/jpackage/createinstaller/windows/base/JPackageCreateInstallerWinUpgradeUUIDBase.java 2019-02-28 20:50:47.126776000 -0800 @@ -102,7 +102,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar" + File.pathSeparator + FILE_1, "--app-version", "1.0", "--win-upgrade-uuid", "F0B18E75-52AD-41A2-BC86-6BE4FCD50BEB"}; @@ -115,7 +114,6 @@ "--name", TEST_NAME, "--main-jar", "hello.jar", "--main-class", "Hello", - "--overwrite", "--files", "hello.jar" + File.pathSeparator + FILE_2, "--app-version", "2.0", "--win-upgrade-uuid", "F0B18E75-52AD-41A2-BC86-6BE4FCD50BEB"}; --- old/test/jdk/tools/jpackage/helpers/JPackageHelper.java 2019-02-28 20:50:54.436506900 -0800 +++ new/test/jdk/tools/jpackage/helpers/JPackageHelper.java 2019-02-28 20:50:53.154378700 -0800 @@ -22,11 +22,15 @@ */ import java.io.File; +import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.List; @@ -149,6 +153,47 @@ return command; } + private static void deleteRecursive(File path) throws IOException { + if (!path.exists()) { + return; + } + + Path directory = path.toPath(); + Files.walkFileTree(directory, new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, + BasicFileAttributes attr) throws IOException { + if (OS.startsWith("win")) { + Files.setAttribute(file, "dos:readonly", false); + } + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult preVisitDirectory(Path dir, + BasicFileAttributes attr) throws IOException { + if (OS.startsWith("win")) { + Files.setAttribute(dir, "dos:readonly", false); + } + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException e) + throws IOException { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } + }); + } + + public static void deleteOutputFolder(String output) throws IOException { + File outputFolder = new File(output); + System.out.println("AMDEBUG output: " + outputFolder.getAbsolutePath()); + deleteRecursive(outputFolder); + } + public static String executeCLI(boolean retValZero, String... args) throws Exception { int retVal; File outfile = new File("output.log"); --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageOverwriteTest.java 2019-02-28 20:51:00.175080700 -0800 +++ /dev/null 2019-02-28 20:51:00.000000000 -0800 @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -import java.io.File; -import java.nio.file.Files; - -/* - * @test - * @summary jpackage create image to verify --overwrite - * @library ../helpers - * @build JPackageHelper - * @build JPackagePath - * @modules jdk.jpackage - * @run main/othervm -Xmx512m JPackageCreateImageOverwriteTest - */ -public class JPackageCreateImageOverwriteTest { - 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", - "--output", "TBD"}; - - private static final String[] CMD_OVERWRITE = { - "create-image", - "--input", "input", - "--name", "test", - "--main-jar", "hello.jar", - "--main-class", "Hello", - "--overwrite", - "--files", "hello.jar", - "--output", "TBD"}; - - private static void validateResult(String[] result) throws Exception { - if (result.length != 2) { - throw new AssertionError( - "Unexpected number of lines: " + result.length); - } - - if (!result[0].trim().equals("jpackage test application")) { - throw new AssertionError("Unexpected result[0]: " + result[0]); - } - - if (!result[1].trim().equals("args.length: 0")) { - throw new AssertionError("Unexpected result[1]: " + result[1]); - } - } - - private static void validate(String result) throws Exception { - if (!result.contains("java.io.IOException") && - !result.contains("already exists") && - !result.contains("--overwrite is not specified")) { - System.err.println(result); - throw new AssertionError("Unexpected error message"); - } - } - - private static void validateOverwrite() throws Exception { - int retVal = JPackageHelper.execute(null, app); - if (retVal != 0) { - throw new AssertionError( - "Test application exited with error: " + retVal); - } - - File outfile = new File(appWorkingDir + File.separator + appOutput); - if (!outfile.exists()) { - throw new AssertionError(appOutput + " was not created"); - } - - String output = Files.readString(outfile.toPath()); - String[] result = output.split("\n"); - validateResult(result); - } - - private static void testOverwrite() throws Exception { - CMD[CMD.length - 1] = "output"; - CMD_OVERWRITE[CMD_OVERWRITE.length - 1] = "output"; - - String appFolder = "test"; - if (JPackageHelper.isOSX()) { - appFolder = "test.app"; - } - - File output = new File("output" + File.separator + appFolder); - if (output.exists()) { - throw new AssertionError( - "Output folder already exist"); - } - output.mkdirs(); - - String result = JPackageHelper.executeCLI(false, CMD); - validate(result); - - JPackageHelper.executeCLI(true, CMD_OVERWRITE); - validateOverwrite(); - } - - private static void testOverwriteToolProvider() throws Exception { - CMD[CMD.length - 1] = "outputToolProvider"; - CMD_OVERWRITE[CMD_OVERWRITE.length - 1] = "outputToolProvider"; - - String appFolder = "test"; - if (JPackageHelper.isOSX()) { - appFolder = "test.app"; - } - - File output = new File("outputToolProvider" + File.separator + appFolder); - if (output.exists()) { - throw new AssertionError( - "Output folder already exist"); - } - output.mkdirs(); - - String result = JPackageHelper.executeToolProvider(false, CMD); - validate(result); - - JPackageHelper.executeToolProvider(true, CMD_OVERWRITE); - validateOverwrite(); - } - - public static void main(String[] args) throws Exception { - JPackageHelper.createHelloImageJar(); - testOverwrite(); - testOverwriteToolProvider(); - } - -} --- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageStripNativeCommandsTest.java 2019-02-28 20:51:03.676430800 -0800 +++ /dev/null 2019-02-28 20:51:04.000000000 -0800 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; - - /* - * @test - * @summary jpackage create image with --strip-native-commands test - * @library ../helpers - * @build JPackageHelper - * @build JPackagePath - * @modules jdk.jpackage - * @run main/othervm -Xmx512m JPackageCreateImageStripNativeCommandsTest - */ -public class JPackageCreateImageStripNativeCommandsTest { - private static final String runtimeBinPath = JPackagePath.getRuntimeBin(); - - private static final String [] CMD = { - "create-image", - "--input", "input", - "--output", "output", - "--name", "test", - "--main-jar", "hello.jar", - "--main-class", "Hello", - "--files", "hello.jar", - "--overwrite", - "--strip-native-commands"}; - - private static void validate() throws Exception { - if (JPackageHelper.isWindows()) { - Path binPath = Paths.get(runtimeBinPath).toAbsolutePath(); - List files = Files.walk(binPath).collect(Collectors.toList()); - files.forEach((f) -> { - if (f.toString().endsWith(".exe")) { - throw new AssertionError( - "Found executable file in runtime bin folder: " - + f.toString()); - } - }); - } else { - File binFolder = new File(runtimeBinPath); - if (binFolder.exists()) { - throw new AssertionError("Found bin folder in runtime: " - + binFolder.toString()); - } - } - } - - private static void testCreateImage() throws Exception { - JPackageHelper.executeCLI(true, CMD); - validate(); - } - - private static void testCreateImageToolProvider() throws Exception { - JPackageHelper.executeToolProvider(true, CMD); - validate(); - } - - public static void main(String[] args) throws Exception { - JPackageHelper.createHelloImageJar(); - testCreateImage(); - testCreateImageToolProvider(); - } - -}