Get it building again and course refresh and test run done via core

Author: jamo

maven-wrapper/pom.xml

@@ -267,7 +267,6 @@
             <type>jar</type>
             <version>4.3.4</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -288,27 +287,6 @@
             <artifactId>mockito-all</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tmc-checkstyle-runner</artifactId>
-            <version>1.0.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.puppycrawl.tools</groupId>
-                    <artifactId>checkstyle</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tmc-junit-runner</artifactId>
-            <version>0.2.5</version>
-        </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-java-client</artifactId>
@@ -345,6 +323,7 @@
                         <publicPackage>org.apache.commons.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.core.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.langs.abstraction.*</publicPackage>
+                        <publicPackage>fi.helsinki.cs.tmc.langs.domain.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.langs.util.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.stylerunner.*</publicPackage>
                         <publicPackage>fi.helsinki.cs.tmc.testrunner.*</publicPackage>

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

@@ -1,17 +1,16 @@
 package fi.helsinki.cs.tmc.actions;
 
+import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.data.ResultCollector;
-import fi.helsinki.cs.tmc.events.TmcEvent;
-import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.runners.CheckstyleRunHandler;
-import fi.helsinki.cs.tmc.runners.TestRunHandler;
 
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
 import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 
@@ -22,15 +21,11 @@ public class RunTestsLocallyAction extends AbstractExerciseSensitiveAction imple
 
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
-    private CheckstyleRunHandler checkstyleRunHandler;
-    private TestRunHandler testRunHandler;
     private Project project;
 
     public RunTestsLocallyAction() {
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
-        this.checkstyleRunHandler = new CheckstyleRunHandler();
-        this.testRunHandler = new TestRunHandler();
 
         putValue("noIconInMenu", Boolean.TRUE);
     }
@@ -76,9 +71,13 @@ protected boolean enabledFor(Exercise exercise) {
     public void run() {
         Exercise exercise = exerciseForProject(project);
         if (exercise != null) {
-            ResultCollector resultCollector = new ResultCollector(exercise);
-            this.checkstyleRunHandler.performAction(resultCollector, project);
-            this.testRunHandler.performAction(resultCollector, project);
+            try {
+                ResultCollector resultCollector = new ResultCollector(exercise);
+                resultCollector.setLocalTestResults(TmcCore.get().runTests(ProgressObserver.NULL_OBSERVER, exercise).call());
+                resultCollector.setValidationResult(TmcCore.get().runCheckStyle(ProgressObserver.NULL_OBSERVER, exercise).call());
+            } catch (Exception ex) {
+                Exceptions.printStackTrace(ex);
+            }
         }
     }
 }

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

@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.actions;
 
+import fi.helsinki.cs.tmc.core.TmcCore;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;

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

@@ -3,9 +3,11 @@
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
+import fi.helsinki.cs.tmc.langs.domain.RunResult;
+import fi.helsinki.cs.tmc.langs.domain.TestResult;
 import fi.helsinki.cs.tmc.ui.TestResultWindow;
 
-import java.util.List;
+import com.google.common.collect.ImmutableList;
 
 /**
  * Waits for test and validation results and shows the result view only when
@@ -14,7 +16,7 @@
 public final class ResultCollector {
 
     private final Exercise exercise;
-    private List<TestCaseResult> testCaseResults;
+    private ImmutableList<TestResult> testCaseResults;
     private ValidationResult validationResults;
 
     private boolean testCaseResultsSet = false;
@@ -35,14 +37,18 @@ public void setValidationResult(final ValidationResult result) {
         showResultsIfReady();
     }
 
-    public void setTestCaseResults(final List<TestCaseResult> results) {
+    public void setTestCaseResults(final ImmutableList<TestResult> results) {
 
         this.testCaseResults = results;
         this.testCaseResultsSet = true;
 
         showResultsIfReady();
     }
 
+    public void setLocalTestResults(RunResult runResult) {
+        setTestCaseResults(runResult.testResults);
+    }
+    
     private void showResultsIfReady() {
 
         boolean ready = testCaseResultsSet && validationResultsSet;
@@ -63,9 +69,8 @@ public void setReturnable(final boolean returnable) {
 
     private boolean isSubmittable() {
 
-        for (TestCaseResult result : testCaseResults) {
-
-            if (!result.isSuccessful()) {
+        for (TestResult result : testCaseResults) {
+            if (!result.passed) {
                 return false;
             }
         }
@@ -80,4 +85,6 @@ private boolean isSubmittable() {
 
         return isReturnable;
     }
+
+    
 }