Change RunResult to never be null in AbstractJavaPlugin

Author: Redande

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.5-SNAPSHOT</version>
+    <version>0.7.6-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.5-SNAPSHOT</version>
+    <version>0.7.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-java/src/main/java/fi/helsinki/cs/tmc/langs/java/AbstractJavaPlugin.java

@@ -133,9 +133,14 @@ public RunResult runTests(Path projectRootPath) {
             RunResult result = resultParser.parseTestResult(results);
             results.getTestResultsFile().delete();
             return result;
-        } catch (TestRunnerException | TestScannerException ex) {
+        } catch (TestRunnerException ex) {
             log.error("Unable to create run result file", ex);
-            return null;
+            return new RunResult(RunResult.Status.TESTRUN_INTERRUPTED,
+                    ImmutableList.<TestResult>of(), ImmutableMap.<String, byte[]>of());
+        } catch (TestScannerException ex) {
+            log.error("Unable to create run result file", ex);
+            return new RunResult(RunResult.Status.COMPILE_FAILED, ImmutableList.<TestResult>of(),
+                    ImmutableMap.<String, byte[]>of());
         }
     }
 

tmc-langs-java/src/test/java/fi/helsinki/cs/tmc/langs/java/AbstractJavaPluginTest.java

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.CompileResult;
 import fi.helsinki.cs.tmc.langs.domain.ExerciseDesc;
+import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.langs.io.StudentFilePolicy;
 import fi.helsinki.cs.tmc.langs.io.sandbox.StudentFileAwareSubmissionProcessor;
 import fi.helsinki.cs.tmc.langs.io.sandbox.SubmissionProcessor;
@@ -139,7 +140,7 @@ protected ClassPath getProjectClassPath(Path path) throws IOException {
     }
 
     @Test
-    public void testRunnerExceptionDuringRunTestsReturnsNull() {
+    public void testRunnerExceptionDuringRunTestsReturnsStatusTestRunInterrupted() {
         AbstractJavaPlugin plugin =
                 new StubLanguagePlugin(Paths.get("")) {
                     @Override
@@ -149,11 +150,11 @@ protected TestRunFileAndLogs createRunResultFile(Path path)
                     }
                 };
 
-        assertNull(plugin.runTests(null));
+        assertEquals(plugin.runTests(null).status, RunResult.Status.TESTRUN_INTERRUPTED);
     }
 
     @Test
-    public void testScannerExceptionDuringRunTestsReturnsNull() {
+    public void testScannerExceptionDuringRunTestsReturnsStatusCompileFailed() {
         AbstractJavaPlugin plugin =
                 new StubLanguagePlugin(Paths.get("")) {
                     @Override
@@ -163,7 +164,7 @@ protected TestRunFileAndLogs createRunResultFile(Path path)
                     }
                 };
 
-        assertNull(plugin.runTests(null));
+        assertEquals(plugin.runTests(null).status, RunResult.Status.COMPILE_FAILED);
     }
 
     @Test

tmc-langs-make/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-notests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-python3/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <properties>