Merge pull request #305 from tmc-cli/resultprinter-fix-juha

Print valgrind errors from SubmissionResult

Author: juvester

src/main/java/fi/helsinki/cs/tmc/cli/io/ResultPrinter.java

@@ -1,8 +1,8 @@
 package fi.helsinki.cs.tmc.cli.io;
 
-import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
+import fi.helsinki.cs.tmc.langs.domain.SpecialLogs;
 import fi.helsinki.cs.tmc.langs.domain.TestResult;
 
 import java.util.List;
@@ -56,9 +56,27 @@ public void printSubmissionResult(SubmissionResult result, Boolean printProgress
 
         printTestResults(result.getTestCases());
 
-        if (result.getStatus() == SubmissionResult.Status.ERROR) {
-            io.println("");
-            io.println(result.getError());
+        switch (result.getStatus()) {
+            case ERROR:
+                io.println("");
+                io.println(result.getError());
+                break;
+            case FAIL:
+                String valgrind = result.getValgrind();
+                if (valgrind != null && !valgrind.isEmpty()) {
+                    io.println(Color.colorString("Valgrind error:",
+                            Color.AnsiColor.ANSI_RED));
+                    io.println(valgrind);
+                    return;
+                }
+                break;
+            case PROCESSING:
+                io.println("PROCESSING");
+                break;
+            case OK:
+                //io.println("OK");
+                break;
+            default:
         }
 
         if (printProgressBar && this.total > 0) {
@@ -85,7 +103,6 @@ public void printSubmissionResult(SubmissionResult result, Boolean printProgress
         if (msg != null) {
             io.println(msg);
         }
-        return;
     }
 
     public void printRunResult(RunResult result, Boolean printProgressBar,
@@ -111,6 +128,12 @@ public void printRunResult(RunResult result, Boolean printProgressBar,
             case COMPILE_FAILED:
                 msg = ResultPrinter.COMPILE_ERROR_MESSAGE;
                 break;
+            case TESTRUN_INTERRUPTED:
+                msg = "Testrun interrupted";
+                break;
+            case GENERIC_ERROR:
+                msg = new String(result.logs.get(SpecialLogs.GENERIC_ERROR_MESSAGE));
+                break;
             default:
         }
         if (msg != null) {

src/test/java/fi/helsinki/cs/tmc/cli/io/ResultPrinterTest.java

@@ -47,20 +47,23 @@ public void printSubmissionResultWorksIfResultIsNull() {
 
     @Test
     public void printSubmissionResultWorksIfAllTestsPass() {
+        when(mockSubResult.getStatus()).thenReturn(SubmissionResult.Status.OK);
         when(mockSubResult.getTestResultStatus()).thenReturn(TestResultStatus.NONE_FAILED);
         printer.printSubmissionResult(mockSubResult, false, null, null);
         assertTrue(io.out().contains("All tests passed on server!"));
     }
 
     @Test
     public void printSubmissionResultWorksIfAllTestsFail() {
+        when(mockSubResult.getStatus()).thenReturn(SubmissionResult.Status.FAIL);
         when(mockSubResult.getTestResultStatus()).thenReturn(TestResultStatus.ALL_FAILED);
         printer.printSubmissionResult(mockSubResult, false, null, null);
         assertTrue(io.out().contains("All tests failed on server."));
     }
 
     @Test
     public void printSubmissionResultWorksIfSomeTestsFail() {
+        when(mockSubResult.getStatus()).thenReturn(SubmissionResult.Status.FAIL);
         when(mockSubResult.getTestResultStatus()).thenReturn(TestResultStatus.SOME_FAILED);
         printer.printSubmissionResult(mockSubResult, false, null, null);
         assertTrue(io.out().contains("Some tests failed on server."));
@@ -73,7 +76,7 @@ public void printRunResultWorksIfTestsPass() {
         printer.printRunResult(runResult, false, null, null);
         assertTrue(io.out().contains("All tests passed!"));
     }
-    
+
     @Test
     public void printRunResultWorksIfTestsFail() {
         testResults = ImmutableList.of(new TestResult("test1", false, "Not good.",
@@ -82,7 +85,7 @@ public void printRunResultWorksIfTestsFail() {
         printer.printRunResult(runResult, false, null, null);
         assertTrue(io.out().contains("Please review your answer before submitting"));
     }
-    
+
     @Test
     public void printRunResultWorksIfTestsFailWithException() {
         ImmutableList<String> points = ImmutableList.of("1");
@@ -93,7 +96,7 @@ public void printRunResultWorksIfTestsFailWithException() {
         printer.printRunResult(runResult, false, null, null);
         assertTrue(io.out().contains("Please review your answer before submitting"));
     }
-    
+
     @Test
     public void printRunResultWorksIfCompilationFail() {
         testResults = ImmutableList.of();