tests/system/src/test/java/test/sandbox/SandboxAppTest.java

rev 9568 : 8147427: refactor test launchers to support jake
Reviewed-by: kcr

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -24,11 +24,11 @@
  */
 
 package test.sandbox;
 
 import com.sun.javafx.PlatformUtil;
-import java.io.File;
+import java.util.ArrayList;
 import junit.framework.AssertionFailedError;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;

@@ -41,43 +41,30 @@
 public class SandboxAppTest {
 
     private static final String className = SandboxAppTest.class.getName();
     private static final String pkgName = className.substring(0, className.lastIndexOf("."));
 
-    private String getJfxrtDir(final String classpath) {
-        final String jfxrt = "jfxrt.jar";
-        String cp = classpath;
-        int idx = cp.replace('\\', '/').indexOf("/" + jfxrt);
-        assertTrue("No " + jfxrt + " in classpath", idx >= 0);
-        cp = cp.substring(0, idx);
-        idx = cp.lastIndexOf(File.pathSeparator);
-        if (idx >= 0) {
-            cp = cp.substring(idx, cp.length());
-        }
-        return cp;
-    }
-
     private static String getTestPolicyFile() {
         return SandboxAppTest.class.getResource("test.policy").toExternalForm();
     }
 
     private void runSandboxedApp(String appName) throws Exception {
         runSandboxedApp(appName, ERROR_NONE);
     }
 
     private void runSandboxedApp(String appName, int exitCode) throws Exception {
         final String testAppName = pkgName + ".app." + appName;
-        final String classpath = System.getProperty("java.class.path");
-        final String jfxrtDir = getJfxrtDir(classpath);
         final String testPolicy = getTestPolicyFile();
-        ProcessBuilder builder;
-        builder = new ProcessBuilder("java",
-                "-Djava.ext.dirs=" + jfxrtDir,
-                "-Djava.security.manager",
-                "-Djava.security.policy=" + testPolicy,
-                "-cp", classpath,
-                testAppName);
+
+        final ArrayList<String> cmd = 
+                test.util.Util.createApplicationLaunchCommand(
+                        testAppName,
+                        null,
+                        testPolicy
+                );
+
+        final ProcessBuilder builder = new ProcessBuilder(cmd);
         builder.redirectError(ProcessBuilder.Redirect.INHERIT);
         builder.redirectOutput(ProcessBuilder.Redirect.INHERIT);
         Process process = builder.start();
         int retVal = process.waitFor();
         switch (retVal) {