Refactor MavenExerciseRunner

Author: Ville Heikkinen

tmc-plugin/src/fi/helsinki/cs/tmc/runners/AntExerciseRunner.java

@@ -40,8 +40,7 @@ public Callable<Optional<TestRunResult>> getTestRunningTask(final TmcProjectInfo
             @Override
             public Optional<TestRunResult> call() throws Exception {
 
-                log.log(INFO,
-                        "Starting compile");
+                log.log(INFO, "Starting compile");
 
                 Project project = projectInfo.getProject();
                 FileObject buildScript = project.getProjectDirectory().getFileObject("build.xml");
@@ -63,15 +62,15 @@ public Optional<TestRunResult> call() throws Exception {
                 int compileResult = task.result();
                 if (compileResult == 0) {
                     log.log(INFO, "Compile success for project {0}", projectInfo.toString());
-                    return Optional.of(runTests(projectInfo));
+                    return Optional.of(runTestTask(projectInfo));
                 } else {
                     return Optional.absent();
                 }
             }
         };
     }
 
-    protected TestRunResult runTests(final TmcProjectInfo projectInfo) throws UserVisibleException, IOException, InterruptedException, ExecutionException {
+    protected TestRunResult runTestTask(final TmcProjectInfo projectInfo) throws UserVisibleException, IOException, InterruptedException, ExecutionException {
 
         FileObject testDir = findTestDir(projectInfo);
         if (testDir == null) {

tmc-plugin/src/fi/helsinki/cs/tmc/runners/MavenExerciseRunner.java

@@ -1,6 +1,6 @@
-/**
- * package fi.helsinki.cs.tmc.runners;
+package fi.helsinki.cs.tmc.runners;
 
+import com.google.common.base.Optional;
 import fi.helsinki.cs.tmc.data.Exercise;
 import fi.helsinki.cs.tmc.data.TestRunResult;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
@@ -14,47 +14,53 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.logging.Level;
+import static java.util.logging.Level.INFO;
+import java.util.logging.Logger;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.windows.IOProvider;
 import org.openide.windows.InputOutput;
 
 public class MavenExerciseRunner extends AbstractJavaExerciseRunner {
+
     private static final String MAVEN_TEST_RUN_GOAL = "fi.helsinki.cs.tmc:tmc-maven-plugin:1.6:test";
+    private static final Logger log = Logger.getLogger(MavenExerciseRunner.class.getName());
 
     @Override
-    public Callable<Integer> getCompilingTask(TmcProjectInfo projectInfo) {
-        File projectDir = projectInfo.getProjectDirAsFile();
-
-        String goal = "test-compile";
-        final InputOutput inOut = IOProvider.getDefault().getIO(projectInfo.getProjectName(), false);
-
-        final ProcessRunner runner = new MavenRunBuilder()
-                .setProjectDir(projectDir)
-                .addGoal(goal)
-                .setIO(inOut)
-                .createProcessRunner();
-
-        return new Callable<Integer>() {
+    public Callable<Optional<TestRunResult>> getTestRunningTask(final TmcProjectInfo projectInfo) {
+        return new Callable<Optional<TestRunResult>>() {
             @Override
-            public Integer call() throws Exception {
+            public Optional<TestRunResult> call() throws Exception {
+                File projectDir = projectInfo.getProjectDirAsFile();
+                log.log(INFO, "Starting compile");
+                String goal = "test-compile";
+                final InputOutput inOut = IOProvider.getDefault().getIO(projectInfo.getProjectName(), false);
+
+                final ProcessRunner runner = new MavenRunBuilder()
+                        .setProjectDir(projectDir)
+                        .addGoal(goal)
+                        .setIO(inOut)
+                        .createProcessRunner();
                 try {
                     ProcessResult result = runner.call();
                     int ret = result.statusCode;
                     if (ret != 0) {
                         inOut.select();
+                        log.log(INFO, "Compile resulted in non-zero exit code {0}", result.statusCode);
+                        return Optional.absent();
+                    } else {
+                        log.log(INFO, "Running tests");
+                        return Optional.of(runTests(projectInfo));
                     }
-                    return ret;
                 } catch (Exception ex) {
                     inOut.select();
                     throw ex;
                 }
             }
+
         };
     }
 
-    @Override
-    public Callable<TestRunResult> getTestRunningTask(final TmcProjectInfo projectInfo) {
+    public TestRunResult runTests(final TmcProjectInfo projectInfo) throws Exception {
         final File projectDir = projectInfo.getProjectDirAsFile();
         String goal = MAVEN_TEST_RUN_GOAL;
         Map<String, String> props = new HashMap<String, String>();
@@ -83,17 +89,11 @@ public Callable<TestRunResult> getTestRunningTask(final TmcProjectInfo projectIn
                 .setIO(inOut)
                 .createProcessRunner();
 
-        return new Callable<TestRunResult>() {
-            @Override
-            public TestRunResult call() throws Exception {
-                runner.call();
-                File resultsFile = new File(
-                        projectDir.getPath() + File.separator
-                        + "target" + File.separator
-                        + "test_output.txt");
-                return resultParser.parseTestResults(resultsFile);
-            }
-        };
+        runner.call();
+        File resultsFile = new File(
+                projectDir.getPath() + File.separator
+                + "target" + File.separator
+                + "test_output.txt");
+        return resultParser.parseTestResults(resultsFile);
     }
 }
-*/

tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java

@@ -90,7 +90,8 @@ public void bgTaskCancelled() {
     private AbstractExerciseRunner getRunner(TmcProjectInfo projectInfo) {
         switch (projectInfo.getProjectType()) {
             case JAVA_MAVEN:
-                return null;
+                log.log(INFO, "Maven task selected");
+                return new MavenExerciseRunner();
             case JAVA_SIMPLE:
                 log.log(INFO, "Ant task selected");
                 return new AntExerciseRunner();