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

*** 22,104 ****
   */
  
   /*
   * @test
   * @summary jpackage create image missing arguments test
!  * @library helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageMissingArgumentsTest
   */
  
! public class JPackageMissingArgumentsTest {
!     private static final String [] RESULT_1 = {"--output"};
      private static final String [] CMD_1 = {
!         "create-app-image",
!         "--input", "input",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
      };
  
!     private static final String [] RESULT_2 = {"--input"};
      private static final String [] CMD_2 = {
!         "create-app-image",
!         "--output", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
      };
  
!     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",
!     };
! 
!     private static final String [] RESULT_4 = {"main class was not specified"};
!     private static final String [] CMD_4 = {
!         "create-app-image",
          "--input", "input",
!         "--output", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
      };
  
!     private static final String [] RESULT_5 = {"--main-jar"};
!     private static final String [] CMD_5 = {
!         "create-app-image",
          "--input", "input",
!         "--output", "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",
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
      };
  
!     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",
      };
  
      private static void validate(String output, String [] expected,
             boolean single) throws Exception {
!         String[] result = output.split("\n");
          if (single && result.length != 1) {
              System.err.println(output);
              throw new AssertionError("Invalid number of lines in output: "
                      + result.length);
          }
--- 22,96 ----
   */
  
   /*
   * @test
   * @summary jpackage create image missing arguments test
!  * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @modules jdk.incubator.jpackage
!  * @run main/othervm -Xmx512m MissingArgumentsTest
   */
  
! public class MissingArgumentsTest {
!     private static final String [] RESULT_1 = {"--input"};
      private static final String [] CMD_1 = {
!         "--type", "app-image",
!         "--dest", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
      };
  
!     private static final String [] RESULT_2 = {"--input", "--app-image"};
      private static final String [] CMD_2 = {
!         "--type", "app-image",
!         "--type", "invalid-type",
!         "--dest", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
          "--main-class", "Hello",
      };
  
!     private static final String [] RESULT_3 = {"main class was not specified"};
      private static final String [] CMD_3 = {
!         "--type", "app-image",
          "--input", "input",
!         "--dest", "output",
          "--name", "test",
          "--main-jar", "hello.jar",
      };
  
!     private static final String [] RESULT_4 = {"--main-jar"};
!     private static final String [] CMD_4 = {
!         "--type", "app-image",
          "--input", "input",
!         "--dest", "output",
          "--name", "test",
          "--main-class", "Hello",
      };
  
!     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_6 = {"--module-path", "--runtime-image",
                                                 "--app-image"};
!     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 = JPackageHelper.splitAndFilter(output);
          if (single && result.length != 1) {
              System.err.println(output);
              throw new AssertionError("Invalid number of lines in output: "
                      + result.length);
          }
*** 118,163 ****
  
          output = JPackageHelper.executeCLI(false, CMD_2);
          validate(output, RESULT_2, true);
  
          output = JPackageHelper.executeCLI(false, CMD_3);
!         validate(output, RESULT_3, true);
  
          output = JPackageHelper.executeCLI(false, CMD_4);
!         validate(output, RESULT_4, false);
  
          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);
  
          output = JPackageHelper.executeToolProvider(false, CMD_4);
!         validate(output, RESULT_4, false);
  
          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();
--- 110,150 ----
  
          output = JPackageHelper.executeCLI(false, CMD_2);
          validate(output, RESULT_2, true);
  
          output = JPackageHelper.executeCLI(false, CMD_3);
!         validate(output, RESULT_3, false);
  
          output = JPackageHelper.executeCLI(false, CMD_4);
!         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);
  
      }
  
      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, false);
  
          output = JPackageHelper.executeToolProvider(false, CMD_4);
!         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);
      }
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloImageJar();
          testMissingArg();