tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java

rev 10911 : 8198329: Support FX build / test using JDK that doesn't include javafx.* modules
Reviewed-by:

*** 23,32 ****
--- 23,33 ----
   * questions.
   */
  
  package test.launchertest;
  
+ import java.io.File;
  import java.util.ArrayList;
  import junit.framework.AssertionFailedError;
  import org.junit.Test;
  
  import static org.junit.Assert.*;
*** 44,54 ****
      private static final String modulePath6 = System.getProperty("launchertest.testapp6.module.path");
      private static final String moduleName = "mymod";
  
      private final int testExitCode = ERROR_NONE;
  
!     private void doTestLaunchModule(String modulePath, String testAppName) throws Exception {
          assertNotNull(testAppName);
          System.err.println("The following Unknown module WARNING messages are expected:");
          String mpArg = "--module-path=" + modulePath;
          String moduleAppName = "--module=" + moduleName + "/" + testAppName;
          final ArrayList<String> cmd =
--- 45,62 ----
      private static final String modulePath6 = System.getProperty("launchertest.testapp6.module.path");
      private static final String moduleName = "mymod";
  
      private final int testExitCode = ERROR_NONE;
  
!     private void doTestLaunchModule(String appModulePath, String testAppName) throws Exception {
!         final String javafxModulePath = System.getProperty("worker.module.path");
!         String modulePath;
!         if (javafxModulePath != null) {
!             modulePath = javafxModulePath + File.pathSeparator + appModulePath;
!         } else {
!             modulePath = appModulePath;
!         }
          assertNotNull(testAppName);
          System.err.println("The following Unknown module WARNING messages are expected:");
          String mpArg = "--module-path=" + modulePath;
          String moduleAppName = "--module=" + moduleName + "/" + testAppName;
          final ArrayList<String> cmd =