1.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.java Thu Mar 14 01:45:44 2013 -0400
1.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.java Thu Mar 14 08:30:16 2013 +0000
1.3 @@ -31,9 +31,11 @@
1.4 */
1.5
1.6 import java.nio.file.Paths;
1.7 +import java.util.ArrayList;
1.8 +import java.util.Arrays;
1.9 +import java.util.List;
1.10 import java.util.Map;
1.11 import java.util.TreeMap;
1.12 -import com.sun.tools.javac.util.ArrayUtils;
1.13
1.14 //original test: test/tools/javac/ClassPathTest/ClassPathTest.sh
1.15 public class ClassPathTest {
1.16 @@ -92,24 +94,31 @@
1.17 }
1.18
1.19 void checkCompileCommands() throws Exception {
1.20 - String[] mainArgs = ToolBox.getJavacBin();
1.21 -
1.22 // Without the -cp . parameter the command will fail seems like when called
1.23 // from the command line, the current dir is added to the classpath
1.24 // automatically but this is not happening when called using ProcessBuilder
1.25
1.26 // testJavac success ClassPathTest3.java
1.27 - String[] commonArgs = ArrayUtils.concatOpen(mainArgs, "-cp", ".");
1.28 + List<String> mainArgs = new ArrayList<>();
1.29 + mainArgs.add(ToolBox.javacBinary.toString());
1.30 + if (ToolBox.testToolVMOpts != null) {
1.31 + mainArgs.addAll(ToolBox.testToolVMOpts);
1.32 + }
1.33
1.34 - ToolBox.AnyToolArgs successParams =
1.35 - new ToolBox.AnyToolArgs()
1.36 - .setAllArgs(ArrayUtils.concatOpen(commonArgs, "ClassPathTest3.java"));
1.37 + List<String> commonArgs = new ArrayList<>();
1.38 + commonArgs.addAll(mainArgs);
1.39 + commonArgs.addAll(Arrays.asList("-cp", "."));
1.40 +
1.41 + ToolBox.AnyToolArgs successParams = new ToolBox.AnyToolArgs()
1.42 + .appendArgs(commonArgs)
1.43 + .appendArgs("ClassPathTest3.java");
1.44 ToolBox.executeCommand(successParams);
1.45
1.46 // testJavac failure ClassPathTest1.java
1.47 ToolBox.AnyToolArgs failParams =
1.48 new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
1.49 - .setAllArgs(ArrayUtils.concatOpen(commonArgs, "ClassPathTest1.java"));
1.50 + .appendArgs(commonArgs)
1.51 + .appendArgs("ClassPathTest1.java");
1.52 ToolBox.executeCommand(failParams);
1.53
1.54 // This is done inside the executeCommand method
1.55 @@ -119,29 +128,50 @@
1.56 extVars.put("CLASSPATH", "bar");
1.57
1.58 // testJavac success ClassPathTest2.java
1.59 - successParams.setAllArgs(ArrayUtils.concatOpen(mainArgs, "ClassPathTest2.java")).set(extVars);
1.60 + successParams = new ToolBox.AnyToolArgs()
1.61 + .appendArgs(mainArgs)
1.62 + .appendArgs("ClassPathTest2.java")
1.63 + .set(extVars);
1.64 ToolBox.executeCommand(successParams);
1.65
1.66 // testJavac failure ClassPathTest1.java
1.67 - failParams.setAllArgs(ArrayUtils.concatOpen(mainArgs, "ClassPathTest1.java")).set(extVars);
1.68 + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
1.69 + .appendArgs(mainArgs)
1.70 + .appendArgs("ClassPathTest1.java")
1.71 + .set(extVars);
1.72 ToolBox.executeCommand(failParams);
1.73
1.74 // testJavac failure ClassPathTest3.java
1.75 - failParams.setAllArgs(ArrayUtils.concatOpen(mainArgs, "ClassPathTest3.java"));
1.76 + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
1.77 + .appendArgs(mainArgs)
1.78 + .appendArgs("ClassPathTest3.java")
1.79 + .set(extVars);
1.80 ToolBox.executeCommand(failParams);
1.81
1.82 // testJavac success -classpath foo ClassPathTest1.java
1.83
1.84 - commonArgs = ArrayUtils.concatOpen(mainArgs, "-cp", "foo");
1.85 - successParams.setAllArgs(ArrayUtils.concatOpen(commonArgs, "ClassPathTest1.java"));
1.86 + commonArgs.clear();
1.87 + commonArgs.addAll(mainArgs);
1.88 + commonArgs.addAll(Arrays.asList("-cp", "foo"));
1.89 +
1.90 + successParams = new ToolBox.AnyToolArgs()
1.91 + .appendArgs(commonArgs)
1.92 + .appendArgs("ClassPathTest1.java")
1.93 + .set(extVars);
1.94 ToolBox.executeCommand(successParams);
1.95
1.96 // testJavac failure -classpath foo ClassPathTest2.java
1.97 - failParams.setAllArgs(ArrayUtils.concatOpen(commonArgs, "ClassPathTest2.java"));
1.98 + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
1.99 + .appendArgs(commonArgs)
1.100 + .appendArgs("ClassPathTest2.java")
1.101 + .set(extVars);
1.102 ToolBox.executeCommand(failParams);
1.103
1.104 // testJavac failure -classpath foo ClassPathTest3.java
1.105 - failParams.setAllArgs(ArrayUtils.concatOpen(commonArgs, "ClassPathTest3.java"));
1.106 + failParams = new ToolBox.AnyToolArgs(ToolBox.Expect.FAIL)
1.107 + .appendArgs(commonArgs)
1.108 + .appendArgs("ClassPathTest3.java")
1.109 + .set(extVars);
1.110 ToolBox.executeCommand(failParams);
1.111 }
1.112
