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

*** 25,68 ****
   * @test
   * @summary jpackage create image with --java-options test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @build JPackageCreateAppImageJavaOptionsBase
!  * @modules jdk.jpackage
!  * @run main/othervm -Xmx512m JPackageCreateAppImageJavaOptionsModuleTest
   */
! public class JPackageCreateAppImageJavaOptionsModuleTest {
      private static final String OUTPUT = "output";
  
      private static final String[] CMD = {
!         "create-app-image",
!         "--output", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input",
          "--java-options", "TBD"};
  
      private static final String[] CMD2 = {
!         "create-app-image",
!         "--output", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input",
          "--java-options", "TBD",
          "--java-options", "TBD",
          "--java-options", "TBD"};
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloModule();
  
!         JPackageCreateAppImageJavaOptionsBase.testCreateAppImageJavaOptions(CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageJavaOptionsBase.testCreateAppImageJavaOptionsToolProvider(CMD);
  
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageJavaOptionsBase.testCreateAppImageJavaOptions2(CMD2);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JPackageCreateAppImageJavaOptionsBase.testCreateAppImageJavaOptions2ToolProvider(CMD2);
      }
  
  }
--- 25,68 ----
   * @test
   * @summary jpackage create image with --java-options test
   * @library ../helpers
   * @build JPackageHelper
   * @build JPackagePath
!  * @build JavaOptionsBase
!  * @modules jdk.incubator.jpackage
!  * @run main/othervm -Xmx512m JavaOptionsModuleTest
   */
! public class JavaOptionsModuleTest {
      private static final String OUTPUT = "output";
  
      private static final String[] CMD = {
!         "--type", "app-image",
!         "--dest", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input",
          "--java-options", "TBD"};
  
      private static final String[] CMD2 = {
!         "--type", "app-image",
!         "--dest", OUTPUT,
          "--name", "test",
          "--module", "com.hello/com.hello.Hello",
          "--module-path", "input",
          "--java-options", "TBD",
          "--java-options", "TBD",
          "--java-options", "TBD"};
  
      public static void main(String[] args) throws Exception {
          JPackageHelper.createHelloModule();
  
!         JavaOptionsBase.testCreateAppImageJavaOptions(CMD);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JavaOptionsBase.testCreateAppImageJavaOptionsToolProvider(CMD);
  
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JavaOptionsBase.testCreateAppImageJavaOptions2(CMD2);
          JPackageHelper.deleteOutputFolder(OUTPUT);
!         JavaOptionsBase.testCreateAppImageJavaOptions2ToolProvider(CMD2);
      }
  
  }