fixed JUnitErrorModelTest; JaCoCo now passes all tests.

rebeccasmith · rebeccasmith · commit f614df718148 · 2015-10-09T00:41:44.000-05:00
diff --git a/drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java b/drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
@@ -257,6 +257,7 @@ public void junit(OpenDefinitionsDocument doc) throws ClassNotFoundException, IO
     LinkedList<OpenDefinitionsDocument> lod = new LinkedList<OpenDefinitionsDocument>();
     lod.add(doc);
     junitOpenDefDocs(lod, false);
+    debug.logEnd("junit(doc)");
   }
   
   /** Ensures that all documents have been compiled since their last modification and then delegates the actual testing
@@ -268,7 +269,7 @@ private void junitOpenDefDocs(final List<OpenDefinitionsDocument> lod, final boo
     
     // Check_testInProgress flag
     if (_testInProgress) return;
-    
+
     // Reset the JUnitErrorModel, fixes bug #907211 "Test Failures Not Cleared Properly".
     _junitErrorModel = new JUnitErrorModel(new JUnitError[0], null, false);
 
@@ -326,8 +327,7 @@ private void junitOpenDefDocs(final List<OpenDefinitionsDocument> lod, final boo
     * classes by searching the build directories for the documents.  Note: caller must respond to thrown exceptions 
     * by invoking _junitUnitInterrupted (to run hourglassOff() and reset the unit testing UI).
     */
-  private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> 
-    lod, final boolean allTests) {
+  private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> lod, final boolean allTests) {
 
     File buildDir = _model.getBuildDirectory();
 
diff --git a/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java b/drjava/src/edu/rice/cs/drjava/model/junit/JUnitTestManager.java
@@ -229,6 +229,7 @@ public List<String> findTestClasses(final List<String> classNames,
         return false;
     }
     Map<String, List<String>> lineColors = null;
+    this.lastResult = new JUnitResultTuple(true, null);
 
     //Utilities.show("runTestSuite() in SlaveJVM called");
     
@@ -300,7 +301,6 @@ public List<String> findTestClasses(final List<String> classNames,
             StringWriter stackTrace = new StringWriter();
             e.printStackTrace(new PrintWriter(stackTrace));
             //Utilities.show(stackTrace.toString());
-            this.lastResult = new JUnitResultTuple(false, null);
         }
 
         /* Reset the runtime */
@@ -309,10 +309,8 @@ public List<String> findTestClasses(final List<String> classNames,
     }
 
     catch (Exception e) { 
-      this.lastResult = new JUnitResultTuple(false, null);
       JUnitError[] errors = new JUnitError[1];      
-      errors[0] = new JUnitError(null, -1, -1, e.getMessage(), false, "", "", 
-        e.toString(), e.getStackTrace());
+      errors[0] = new JUnitError(null, -1, -1, e.getMessage(), false, "", "", e.toString(), e.getStackTrace());
       _reset();
       _jmc.testSuiteEnded(errors);
       //new ScrollableDialog(null, "Slave JVM: testSuite ended with errors", "", Arrays.toString(errors)).show();
diff --git a/drjava/src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java b/drjava/src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
@@ -463,16 +463,9 @@ public boolean setPackageScope(String packageName) {
   public Option<List<String>> findTestClasses(List<String> classNames, 
     List<File> files, CoverageMetadata coverageMetadata) {
     InterpreterJVMRemoteI remote = _state.value().interpreter(false);
-    if (remote == null) { 
-        return Option.none(); 
-    }
-
-    try { 
-        return Option.some(remote.findTestClasses(classNames, files, coverageMetadata)); 
-    } catch (RemoteException e) { 
-      _handleRemoteException(e); 
-      return Option.none(); 
-    }
+    if (remote == null) { return Option.none(); }
+    try { return Option.some(remote.findTestClasses(classNames, files, coverageMetadata)); } 
+    catch (RemoteException e) { _handleRemoteException(e); return Option.none(); }
   }
   
   /**
