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

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