Merge pull request #72 from testmycode/java-fixes

Make ant projects to use ProcessRunner

Author: nygrenh

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/utils/ProcessRunner.java

@@ -28,7 +28,7 @@ public ProcessRunner(String[] command, Path workDir) {
     }
 
     @Override
-    public ProcessResult call() throws Exception {
+    public ProcessResult call() throws IOException, InterruptedException {
         Process process = null;
         try {
             ProcessBuilder processBuilder = new ProcessBuilder(command);

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/ant/AntPlugin.java

@@ -11,6 +11,8 @@
 import fi.helsinki.cs.tmc.langs.java.TestRunFileAndLogs;
 import fi.helsinki.cs.tmc.langs.java.exception.TestRunnerException;
 import fi.helsinki.cs.tmc.langs.java.exception.TestScannerException;
+import fi.helsinki.cs.tmc.langs.utils.ProcessResult;
+import fi.helsinki.cs.tmc.langs.utils.ProcessRunner;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -25,20 +27,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.List;
-import java.util.Map;
 
 /**
  * A {@link fi.helsinki.cs.tmc.langs.LanguagePlugin} that defines the behaviour
@@ -211,37 +209,21 @@ protected TestRunFileAndLogs createRunResultFile(Path projectBasePath)
                         resultFile,
                         classPath,
                         exercise.get());
-        List<String> testRunnerArguments = argumentBuilder.getArguments();
 
-        StringBuilder stdout = new StringBuilder();
-        StringBuilder stderr = new StringBuilder();
+        ProcessRunner runner =  new ProcessRunner(argumentBuilder.getCommand(), projectBasePath);
 
         try {
-            Process process = new ProcessBuilder(testRunnerArguments).start();
-            process.waitFor();
-            final BufferedReader output =
-                    new BufferedReader(new InputStreamReader(process.getInputStream()));
-            final BufferedReader error =
-                    new BufferedReader(new InputStreamReader(process.getErrorStream()));
-
-            String line;
-            while ((line = output.readLine()) != null) {
-                stdout.append(line);
-            }
-            while ((line = error.readLine()) != null) {
-                stderr.append(line);
-            }
+            ProcessResult result = runner.call();
+            log.info("Successfully ran tests for project at {}", projectBasePath);
+            return new TestRunFileAndLogs(
+                resultFile.toFile(),
+                result.output.getBytes(Charset.forName("UTF-8")),
+                result.errorOutput.getBytes(Charset.forName("UTF-8"))
+            );
         } catch (InterruptedException | IOException e) {
             log.error("Failed to run tests", e);
             throw new TestRunnerException(e);
         }
-
-        log.info("Successfully ran tests for project at {}", projectBasePath);
-
-        return new TestRunFileAndLogs(
-                resultFile.toFile(),
-                stdout.toString().getBytes(Charset.forName("UTF-8")),
-                stderr.toString().getBytes(Charset.forName("UTF-8")));
     }
 
     private String getJvmOptions(Path projectBasePath) {

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/ant/TestRunnerArgumentBuilder.java

@@ -86,9 +86,9 @@ private List<String> createTestCaseArgumentList(ExerciseDesc exercise) {
     }
 
     /**
-     * Get the arguments as a list of Strings, usable with ProcessBuilder.
+     * Get the command with the arguments as a string array. This can be used to start the process.
      */
-    public List<String> getArguments() {
-        return arguments;
+    public String[] getCommand() {
+        return arguments.toArray(new String[0]);
     }
 }

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/maven/MavenInvokatorMavenTaskRunner.java

@@ -97,11 +97,12 @@ public void consumeLine(String line) {
 
     private Path useBundledMaven() {
         Path mavenHome = getConfigDirectory();
-        if (Files.exists(mavenHome)) {
+        Path extractedMavenLocation = mavenHome.resolve("apache-maven-3.3.9");
+        if (Files.exists(extractedMavenLocation)) {
             log.info("Maven already extracted");
 
             // Add the name of the extracted folder to the path
-            return mavenHome.resolve("apache-maven-3.3.9");
+            return extractedMavenLocation;
         }
         log.info("Maven bundle not previously extracted, extracting...");
         try {