Backed out changeset 171883b798be jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 18 Dec 2017 21:55:32 +0000
branchjv
changeset 17854 5b714db88667
parent 17851 171883b798be
child 17998 04e977f44a35
child 18221 adda804955e2
Backed out changeset 171883b798be
Tools__TestRunnerMini.st
--- a/Tools__TestRunnerMini.st	Fri Nov 17 12:27:21 2017 -0300
+++ b/Tools__TestRunnerMini.st	Mon Dec 18 21:55:32 2017 +0000
@@ -1226,22 +1226,30 @@
 !TestRunnerMini::SuiteAndResult methodsFor:'accessing'!
 
 color
+    |numTests numRun|
+
     self testCount > 0 ifTrue:[
         result notNil ifTrue:[
             self hasErrors ifTrue:[^AbstractTestRunner errorColor].
             self hasFailures ifTrue:[^AbstractTestRunner failedColor].
-            self hasPassed ifTrue:[^AbstractTestRunner passedColor].
-            self hasSkipped ifTrue:[^AbstractTestRunner notRunColor].
+            self hasSkipped ifTrue:[^AbstractTestRunner notRunColor]. 
+            self hasPassed ifTrue:[
+                numTests := suite tests size.
+                numRun := result passedCount + result failureCount + result errorCount.
+                numRun = numTests ifTrue:[
+                    ^AbstractTestRunner passedColor 
+                ]
+            ].
         ]
     ].
     ^ AbstractTestRunner notRunColor
 
     "Created: / 15-03-2010 / 15:24:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 27-11-2017 / 21:17:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-09-2014 / 10:04:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 info
-    |numTests numPassed numFailed numRun resources numError |
+    |numTests numPassed numFailed numRun resources numError numSkipped |
 
     result isNil ifTrue:[^''].
 
@@ -1249,7 +1257,8 @@
     numPassed := result passedCount.
     numFailed := result failureCount.
     numError := result errorCount.
-    numRun := numPassed + numFailed + numError.
+    numSkipped := result skippedCount.
+    numRun := numPassed + numFailed + numError + numSkipped.
     "/ (result passedCount + result failureCount + result errorCount) = 1 ifTrue:[^''].
     resources := TestRunnerMini resources.
     numRun == 0 ifTrue:[
@@ -1277,10 +1286,14 @@
             "/ ', %5 errors'...
             s nextPut: $,. numError printOn: s. s space; nextPutAll: (resources string: (numError > 1 ifTrue:[ 'errors' ] ifFalse:[ 'error' ])).
         ].
+        numSkipped > 0 ifTrue:[ 
+            "/ ', %4 failed'...
+            s nextPut: $,. numSkipped printOn: s. s space; nextPutAll: (resources string: 'skipped').
+        ].
     ].
 
     "Created: / 15-03-2010 / 20:23:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 17-11-2017 / 12:23:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-11-2017 / 12:25:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 name