test/jdk/tools/jpackage/share/MissingArgumentsTest.java

@@ -22,83 +22,75 @@
  */
 
  /*
  * @test
  * @summary jpackage create image missing arguments test
- * @library helpers
+ * @library ../helpers
  * @build JPackageHelper
  * @build JPackagePath
- * @modules jdk.jpackage
- * @run main/othervm -Xmx512m JPackageMissingArgumentsTest
+ * @modules jdk.incubator.jpackage
+ * @run main/othervm -Xmx512m MissingArgumentsTest
  */
 
-public class JPackageMissingArgumentsTest {
-    private static final String [] RESULT_1 = {"--output"};
+public class MissingArgumentsTest {
+    private static final String [] RESULT_1 = {"--input"};
     private static final String [] CMD_1 = {
-        "create-app-image",
-        "--input", "input",
+        "--type", "app-image",
+        "--dest", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
         "--main-class", "Hello",
     };
 
-    private static final String [] RESULT_2 = {"--input"};
+    private static final String [] RESULT_2 = {"--input", "--app-image"};
     private static final String [] CMD_2 = {
-        "create-app-image",
-        "--output", "output",
+        "--type", "app-image",
+        "--type", "invalid-type",
+        "--dest", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
         "--main-class", "Hello",
     };
 
-    private static final String [] RESULT_3 = {"--input", "--app-image"};
+    private static final String [] RESULT_3 = {"main class was not specified"};
     private static final String [] CMD_3 = {
-        "create-installer",
-        "--output", "output",
-        "--name", "test",
-        "--main-jar", "hello.jar",
-        "--main-class", "Hello",
-    };
-
-    private static final String [] RESULT_4 = {"main class was not specified"};
-    private static final String [] CMD_4 = {
-        "create-app-image",
+        "--type", "app-image",
         "--input", "input",
-        "--output", "output",
+        "--dest", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
     };
 
-    private static final String [] RESULT_5 = {"--main-jar"};
-    private static final String [] CMD_5 = {
-        "create-app-image",
+    private static final String [] RESULT_4 = {"--main-jar"};
+    private static final String [] CMD_4 = {
+        "--type", "app-image",
         "--input", "input",
-        "--output", "output",
+        "--dest", "output",
         "--name", "test",
         "--main-class", "Hello",
     };
 
-    private static final String [] RESULT_6 = {"--module-path", "--runtime-image"};
-    private static final String [] CMD_6 = {
-        "create-app-image",
-        "--output", "output",
+    private static final String [] RESULT_5 = {"--module-path", "--runtime-image"};
+    private static final String [] CMD_5 = {
+        "--type", "app-image",
+        "--dest", "output",
         "--name", "test",
         "--module", "com.hello/com.hello.Hello",
     };
 
-    private static final String [] RESULT_7 = {"--module-path", "--runtime-image",
+    private static final String [] RESULT_6 = {"--module-path", "--runtime-image",
                                                "--app-image"};
-    private static final String [] CMD_7 = {
-        "create-installer",
-        "--output", "output",
+    private static final String [] CMD_6 = {
+        "--type", "invalid-type",
+        "--dest", "output",
         "--name", "test",
         "--module", "com.hello/com.hello.Hello",
     };
 
     private static void validate(String output, String [] expected,
            boolean single) throws Exception {
-        String[] result = output.split("\n");
+        String[] result = JPackageHelper.splitAndFilter(output);
         if (single && result.length != 1) {
             System.err.println(output);
             throw new AssertionError("Invalid number of lines in output: "
                     + result.length);
         }

@@ -118,46 +110,41 @@
 
         output = JPackageHelper.executeCLI(false, CMD_2);
         validate(output, RESULT_2, true);
 
         output = JPackageHelper.executeCLI(false, CMD_3);
-        validate(output, RESULT_3, true);
+        validate(output, RESULT_3, false);
 
         output = JPackageHelper.executeCLI(false, CMD_4);
-        validate(output, RESULT_4, false);
+        validate(output, RESULT_4, true);
 
         output = JPackageHelper.executeCLI(false, CMD_5);
         validate(output, RESULT_5, true);
 
         output = JPackageHelper.executeCLI(false, CMD_6);
         validate(output, RESULT_6, true);
 
-        output = JPackageHelper.executeCLI(false, CMD_7);
-        validate(output, RESULT_7, true);
     }
 
     private static void testMissingArgToolProvider() throws Exception {
         String output = JPackageHelper.executeToolProvider(false, CMD_1);
         validate(output, RESULT_1, true);
 
         output = JPackageHelper.executeToolProvider(false, CMD_2);
         validate(output, RESULT_2, true);
 
         output = JPackageHelper.executeToolProvider(false, CMD_3);
-        validate(output, RESULT_3, true);
+        validate(output, RESULT_3, false);
 
         output = JPackageHelper.executeToolProvider(false, CMD_4);
-        validate(output, RESULT_4, false);
+        validate(output, RESULT_4, true);
 
         output = JPackageHelper.executeToolProvider(false, CMD_5);
         validate(output, RESULT_5, true);
 
         output = JPackageHelper.executeToolProvider(false, CMD_6);
         validate(output, RESULT_6, true);
-
-        output = JPackageHelper.executeToolProvider(false, CMD_7);
-        validate(output, RESULT_7, true);
     }
 
     public static void main(String[] args) throws Exception {
         JPackageHelper.createHelloImageJar();
         testMissingArg();