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

*** 24,38 ****
  import java.io.File;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  
! public class JPackageCreateAppImageJavaOptionsBase {
  
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
-     private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
  
      private static final String ARGUMENT1 = "-Dparam1=Some Param 1";
      private static final String ARGUMENT2 = "-Dparam2=Some \"Param\" 2";
      private static final String ARGUMENT3 =
              "-Dparam3=Some \"Param\" with \" 3";
--- 24,37 ----
  import java.io.File;
  import java.nio.file.Files;
  import java.util.ArrayList;
  import java.util.List;
  
! public class JavaOptionsBase {
  
      private static final String app = JPackagePath.getApp();
      private static final String appOutput = JPackagePath.getAppOutputFile();
  
      private static final String ARGUMENT1 = "-Dparam1=Some Param 1";
      private static final String ARGUMENT2 = "-Dparam2=Some \"Param\" 2";
      private static final String ARGUMENT3 =
              "-Dparam3=Some \"Param\" with \" 3";
*** 111,127 ****
          if (retVal != 0) {
              throw new AssertionError("Test application exited with error: "
                      + retVal);
          }
  
!         File outfile = new File(appWorkingDir + File.separator + appOutput);
          if (!outfile.exists()) {
              throw new AssertionError(appOutput + " was not created");
          }
  
          String output = Files.readString(outfile.toPath());
!         String[] result = output.split("\n");
          validateResult(result, expectedArgs);
      }
  
      public static void testCreateAppImageJavaOptions(String [] cmd) throws Exception {
          initArguments(false, cmd);
--- 110,126 ----
          if (retVal != 0) {
              throw new AssertionError("Test application exited with error: "
                      + retVal);
          }
  
!         File outfile = new File(appOutput);
          if (!outfile.exists()) {
              throw new AssertionError(appOutput + " was not created");
          }
  
          String output = Files.readString(outfile.toPath());
!         String[] result = JPackageHelper.splitAndFilter(output);
          validateResult(result, expectedArgs);
      }
  
      public static void testCreateAppImageJavaOptions(String [] cmd) throws Exception {
          initArguments(false, cmd);