test/jdk/tools/jpackage/JPackageMissingArgumentsTest.java

@@ -32,74 +32,74 @@
  */
 
 public class JPackageMissingArgumentsTest {
     private static final String [] RESULT_1 = {"--output"};
     private static final String [] CMD_1 = {
-        "create-image",
+        "create-app-image",
         "--input", "input",
         "--name", "test",
         "--main-jar", "hello.jar",
         "--main-class", "Hello",
-        "--files", "hello.jar"};
+    };
 
     private static final String [] RESULT_2 = {"--input"};
     private static final String [] CMD_2 = {
-        "create-image",
+        "create-app-image",
         "--output", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
         "--main-class", "Hello",
-        "--files", "hello.jar"};
+    };
 
     private static final String [] RESULT_3 = {"--input", "--app-image"};
     private static final String [] CMD_3 = {
         "create-installer",
         "--output", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
         "--main-class", "Hello",
-        "--files", "hello.jar"};
+    };
 
-    private static final String [] RESULT_4 = {"--main-class"};
+    private static final String [] RESULT_4 = {"main class was not specified"};
     private static final String [] CMD_4 = {
-        "create-image",
+        "create-app-image",
         "--input", "input",
         "--output", "output",
         "--name", "test",
         "--main-jar", "hello.jar",
-        "--files", "hello.jar"};
+    };
 
     private static final String [] RESULT_5 = {"--main-jar"};
     private static final String [] CMD_5 = {
-        "create-image",
+        "create-app-image",
         "--input", "input",
         "--output", "output",
         "--name", "test",
         "--main-class", "Hello",
-        "--files", "hello.jar"};
+    };
 
     private static final String [] RESULT_6 = {"--module-path", "--runtime-image"};
     private static final String [] CMD_6 = {
-        "create-image",
+        "create-app-image",
         "--output", "output",
         "--name", "test",
         "--module", "com.hello/com.hello.Hello",
-        "--files", "hello.jar"};
+    };
 
     private static final String [] RESULT_7 = {"--module-path", "--runtime-image",
                                                "--app-image"};
     private static final String [] CMD_7 = {
         "create-installer",
         "--output", "output",
         "--name", "test",
         "--module", "com.hello/com.hello.Hello",
-        "--files", "hello.jar"};
+    };
 
-    private static void validate(String output, String [] expected)
-           throws Exception {
+    private static void validate(String output, String [] expected,
+           boolean single) throws Exception {
         String[] result = output.split("\n");
-        if (result.length != 1) {
+        if (single && result.length != 1) {
             System.err.println(output);
             throw new AssertionError("Invalid number of lines in output: "
                     + result.length);
         }
 

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