Display send to server dialog when tests pass

Author: nygrenh

tmc-plugin/src/fi/helsinki/cs/tmc/actions/RunTestsLocallyAction.java

@@ -5,11 +5,13 @@
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.coreimpl.BridgingProgressObserver;
 import fi.helsinki.cs.tmc.data.ResultCollector;
+import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.SourceFileLookup;
+import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 
@@ -30,10 +32,14 @@ public class RunTestsLocallyAction extends AbstractExerciseSensitiveAction imple
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private Project project;
+    private TestResultDisplayer resultDisplayer;
+    private ExerciseSubmitter exerciseSubmitter;
 
     public RunTestsLocallyAction() {
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
+        this.resultDisplayer = TestResultDisplayer.getInstance();
+        this.exerciseSubmitter = new ExerciseSubmitter();
 
         putValue("noIconInMenu", Boolean.TRUE);
     }
@@ -77,7 +83,7 @@ protected boolean enabledFor(Exercise exercise) {
 
     @Override
     public void run() {
-        Exercise exercise = exerciseForProject(project);
+        final Exercise exercise = exerciseForProject(project);
 
         projectMediator.saveAllFiles();
         final ResultCollector resultCollector = new ResultCollector(exercise);
@@ -89,7 +95,14 @@ public void run() {
                 @Override
                 public void bgTaskReady(RunResult result) {
                     log.log(Level.INFO, "Got test results: {0}", result);
-                    resultCollector.setLocalTestResults(result);
+
+                    boolean canSubmitExercise = exercise.isReturnable();
+                    resultDisplayer.showLocalRunResult(result, canSubmitExercise, new Runnable() {
+                        @Override
+                        public void run() {
+                            exerciseSubmitter.performAction(project);
+                        }
+                    }, resultCollector);
                 }
 
                 @Override

tmc-plugin/src/fi/helsinki/cs/tmc/data/ResultCollector.java

@@ -85,7 +85,8 @@ private synchronized void showResultsIfReady() {
 
         boolean ready = dontWaitForValidations || (testCaseResultsSet && validationResultsSet);
         if (ready) {
-            TestResultWindow.get().showResults(exercise, testCaseResults, validationResults, submissionCallback, isSubmittable());
+            final boolean submittable = isSubmittable();
+            TestResultWindow.get().showResults(exercise, testCaseResults, validationResults, submissionCallback, submittable);
         }
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.testrunner.TestCase;
 
 import com.google.common.collect.ImmutableList;
+import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -142,14 +143,14 @@ private void displayFailedTestsMsg(Exercise exercise, SubmissionResult result) {
     /**
      * Shows local results and calls the callback if a submission should be started.
      */
-    public void showLocalRunResult(final ImmutableList<TestResult> results,
+    public void showLocalRunResult(final RunResult runResult,
                                    final boolean returnable,
                                    final Runnable submissionCallback,
                                    final ResultCollector resultCollector) {
 
         resultCollector.setSubmissionCallback(submissionCallback);
-
-        displayTestCases(results, returnable, resultCollector);
+        resultCollector.setReturnable(returnable);
+        resultCollector.setLocalTestResults(runResult);
     }
 
     private void displayError(String error) {