Simplified kotlinc tests.

compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java

@@ -16,10 +16,9 @@
 
 package org.jetbrains.jet.cli;
 
-import com.intellij.openapi.util.Ref;
+import com.intellij.execution.process.ProcessOutput;
+import com.intellij.execution.util.ExecUtil;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.common.ExitCode;
@@ -27,7 +26,7 @@ import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.List;
 
 public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir {
     private void doTest(@NotNull String argsFilePath, @NotNull String executableName, @NotNull String testDataDir) throws Exception {
@@ -35,38 +34,24 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir {
         File kotlincFile = new File(PathUtil.getKotlinPathsForDistDirectory().getHomePath(), "bin/" + executableFileName);
         assertTrue("kotlinc executable not found, probably you need to invoke 'dist' Ant target: " + kotlincFile.getAbsolutePath(), kotlincFile.exists());
 
-        String[] args = CliBaseTest.readArgs(argsFilePath, testDataDir, tmpdir.getAbsolutePath());
+        List<String> args = CliBaseTest.readArgs(argsFilePath, testDataDir, tmpdir.getAbsolutePath());
+        args.add(0, kotlincFile.getAbsolutePath());
+        ProcessOutput processOutput = ExecUtil.execAndGetOutput(args, null);
 
-        final Process process = Runtime.getRuntime().exec(ArrayUtil.prepend(kotlincFile.getAbsolutePath(), args));
+        String stdout = processOutput.getStdout();
+        String stderr = processOutput.getStderr();
+        int exitCode = processOutput.getExitCode();
 
-        final Ref<String> stderr = Ref.create();
+        String normalizedOutput = CliBaseTest.getNormalizedCompilerOutput(stdout, ExitCode.values()[exitCode], testDataDir);
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    stderr.set(FileUtil.loadTextAndClose(process.getErrorStream()));
-                }
-                catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }).start();
-
-        String output = FileUtil.loadTextAndClose(process.getInputStream());
-
-        int intExitCode = process.waitFor();
-        ExitCode exitCode = ExitCode.values()[intExitCode];
-
-        String normalizedOutput = CliBaseTest.getNormalizedCompilerOutput(output, exitCode, testDataDir);
         File outFile = new File(argsFilePath.replace(".args", ".out"));
 
         try {
             JetTestUtils.assertEqualsToFile(outFile, normalizedOutput);
         }
         catch (Exception e) {
-            System.out.println("exitcode " + intExitCode);
+            System.err.println("exitcode " + exitCode);
-            System.out.println("<stdout>" + output + "</stdout>");
+            System.err.println("<stdout>" + stdout + "</stdout>");
-            System.out.println("<stderr>" + stderr + "</stderr>");
+            System.err.println("<stderr>" + stderr + "</stderr>");
 
             throw e;
         }

compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java

@@ -45,12 +45,12 @@ public class CliBaseTest {
     public final TestName testName = new TestName();
 
     @NotNull
-    private static Pair<String, ExitCode> executeCompilerGrabOutput(@NotNull CLICompiler<?> compiler, @NotNull String[] args) {
+    private static Pair<String, ExitCode> executeCompilerGrabOutput(@NotNull CLICompiler<?> compiler, @NotNull List<String> args) {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         PrintStream origOut = System.out;
         try {
             System.setOut(new PrintStream(bytes));
-            ExitCode exitCode = CLICompiler.doMainNoExit(compiler, args);
+            ExitCode exitCode = CLICompiler.doMainNoExit(compiler, ArrayUtil.toStringArray(args));
             return Pair.create(bytes.toString("utf-8"), exitCode);
         }
         catch (Exception e) {
@@ -79,14 +79,14 @@ public class CliBaseTest {
     }
 
     @NotNull
-    static String[] readArgs(
+    static List<String> readArgs(
             @NotNull String argsFilePath,
             @NotNull final String testDataDir,
             @NotNull final String tempDir
     ) throws IOException {
         List<String> lines = FileUtil.loadLines(new FileInputStream(argsFilePath));
 
-        return ArrayUtil.toStringArray(ContainerUtil.mapNotNull(lines, new Function<String, String>() {
+        return ContainerUtil.mapNotNull(lines, new Function<String, String>() {
             @Override
             public String fun(String arg) {
                 if (arg.isEmpty()) {
@@ -97,7 +97,7 @@ public class CliBaseTest {
                         .replace("$TEMP_DIR$", tempDir)
                         .replace("$TESTDATA_DIR$", testDataDir);
             }
-        }));
+        });
     }
 
     protected void executeCompilerCompareOutputJVM() throws Exception {