test/jdk/tools/jpackage/createimage/JPackageCreateImageJavaOptionsBase.java

*** 24,34 ****
  import java.io.File;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  
! public class JPackageCreateImageJVMArgsBase {
  
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
      private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
  
--- 24,34 ----
  import java.io.File;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  
! public class JPackageCreateImageJavaOptionsBase {
  
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
      private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
  
*** 52,74 ****
      }
  
      private static void initArguments2(boolean toolProvider, String [] cmd) {
          int index = cmd.length - 6;
  
!         cmd[index++] = "--jvm-args";
          arguments.clear();
          arguments.add(ARGUMENT1);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
!         cmd[index++] = "--jvm-args";
          arguments.clear();
          arguments.add(ARGUMENT2);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
!         cmd[index++] = "--jvm-args";
          arguments.clear();
          arguments.add(ARGUMENT3);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
--- 52,74 ----
      }
  
      private static void initArguments2(boolean toolProvider, String [] cmd) {
          int index = cmd.length - 6;
  
!         cmd[index++] = "--java-options";
          arguments.clear();
          arguments.add(ARGUMENT1);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
!         cmd[index++] = "--java-options";
          arguments.clear();
          arguments.add(ARGUMENT2);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
!         cmd[index++] = "--java-options";
          arguments.clear();
          arguments.add(ARGUMENT3);
          cmd[index++] = JPackageHelper.listToArgumentsMap(arguments,
                  toolProvider);
  
*** 121,149 ****
          String output = Files.readString(outfile.toPath());
          String[] result = output.split("\n");
          validateResult(result, expectedArgs);
      }
  
!     public static void testCreateImageJVMArgs(String [] cmd) throws Exception {
          initArguments(false, cmd);
          JPackageHelper.executeCLI(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJVMArgsToolProvider(String [] cmd) throws Exception {
          initArguments(true, cmd);
          JPackageHelper.executeToolProvider(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJVMArgs2(String [] cmd) throws Exception {
          initArguments2(false, cmd);
          JPackageHelper.executeCLI(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJVMArgs2ToolProvider(String [] cmd) throws Exception {
          initArguments2(true, cmd);
          JPackageHelper.executeToolProvider(true, cmd);
          validate(arguments);
      }
  }
--- 121,149 ----
          String output = Files.readString(outfile.toPath());
          String[] result = output.split("\n");
          validateResult(result, expectedArgs);
      }
  
!     public static void testCreateImageJavaOptions(String [] cmd) throws Exception {
          initArguments(false, cmd);
          JPackageHelper.executeCLI(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJavaOptionsToolProvider(String [] cmd) throws Exception {
          initArguments(true, cmd);
          JPackageHelper.executeToolProvider(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJavaOptions2(String [] cmd) throws Exception {
          initArguments2(false, cmd);
          JPackageHelper.executeCLI(true, cmd);
          validate(arguments);
      }
  
!     public static void testCreateImageJavaOptions2ToolProvider(String [] cmd) throws Exception {
          initArguments2(true, cmd);
          JPackageHelper.executeToolProvider(true, cmd);
          validate(arguments);
      }
  }