TestRunner.st
changeset 458 cea2b7ff8060
parent 451 341b36f1de3f
child 528 d8d38bbb8fe9
--- a/TestRunner.st	Tue Oct 23 15:58:52 2012 +0200
+++ b/TestRunner.st	Tue Oct 23 21:01:48 2012 +0200
@@ -516,15 +516,15 @@
 !
 
 refreshSuites
-	self updateCategoryList.
-	self updateSuitesList.
+        self updateCategoryList.
+        self updateSuitesList.
 
-	self script value:nil.
-	self tests selection: 0.
-	self defects selection: 0.
-	result := TestResult new.
-	lastTestCase := nil.
-	self displayRefresh
+        self script value:nil.
+        self tests selection: 0.
+        self defects selection: 0.
+        result := TestResult defaultResultClass new.
+        lastTestCase := nil.
+        self displayRefresh
 
     "Created: / 21.6.2000 / 10:58:34 / Sames"
     "Modified: / 21.6.2000 / 12:19:54 / Sames"
@@ -556,53 +556,53 @@
     "/ count the number of individual tests
     numTests := 0.
     aTestSuite tests do:
-	    [:eachTestOrSubSuite |
-	    (eachTestOrSubSuite isKindOf:TestSuite)
-		ifTrue:[numTests := numTests + eachTestOrSubSuite tests size.]
-		ifFalse:[numTests := numTests + 1.]].
+            [:eachTestOrSubSuite |
+            (eachTestOrSubSuite isKindOf:TestSuite)
+                ifTrue:[numTests := numTests + eachTestOrSubSuite tests size.]
+                ifFalse:[numTests := numTests + 1.]].
     numberOfTestsToRun := numTests.
     self percentageDone value:0.
     Cursor wait showWhile:
-	    [|errorCountBefore failureCountBefore|
-	    self displayRunning.
+            [|errorCountBefore failureCountBefore|
+            self displayRunning.
 
-	    "/ self displayDetails: '...'.
+            "/ self displayDetails: '...'.
 
-	    aTestSuite addDependentToHierachy:self.
-	    result := TestResult new.
-	    lastTestCase := aTestSuite.
-	    self showPercentageIndicator.
-	    errorCountBefore := result errorCount.
-	    failureCountBefore := result failureCount.
+            aTestSuite addDependentToHierachy:self.
+            result := TestResult defaultResultClass new.
+            lastTestCase := aTestSuite.
+            self showPercentageIndicator.
+            errorCountBefore := result errorCount.
+            failureCountBefore := result failureCount.
 
-	    [|caseName|
-	    aTestSuite
-		run:result
-		beforeEachDo:
-		    [:eachCase :eachResult |
-		    caseName := eachCase getTestName.
-		    caseName size == 0 ifTrue:[self halt].
-		    self displayDetails:(caseName , '...').
-		    self testPassed:caseName]
-		afterEachDo:
-		    [:eachCase :eachResult |
-		    |passed errorCountAfter failureCountAfter|
-		    errorCountAfter := result errorCount.
-		    failureCountAfter := result failureCount.
-		    passed := (errorCountAfter == errorCountBefore)
-				& (failureCountAfter == failureCountBefore).
-		    passed == true
-			ifTrue:
-			    ["/                                    testsWhichPassed add:caseName.
-			    "/                                    testsWhichFailed remove:caseName ifAbsent:nil.
-			    ]
-			ifFalse:[self testFailed:caseName withResult:result].
-		    errorCountBefore := errorCountAfter.
-		    failureCountBefore := failureCountAfter]] ensure:
-			[aTestSuite removeDependentFromHierachy:self.
-			self hidePercentageIndicator.
-			self displayNormalColorInProgress.].
-	    self updateWindow]
+            [|caseName|
+            aTestSuite
+                run:result
+                beforeEachDo:
+                    [:eachCase :eachResult |
+                    caseName := eachCase getTestName.
+                    caseName size == 0 ifTrue:[self halt].
+                    self displayDetails:(caseName , '...').
+                    self testPassed:caseName]
+                afterEachDo:
+                    [:eachCase :eachResult |
+                    |passed errorCountAfter failureCountAfter|
+                    errorCountAfter := result errorCount.
+                    failureCountAfter := result failureCount.
+                    passed := (errorCountAfter == errorCountBefore)
+                                & (failureCountAfter == failureCountBefore).
+                    passed == true
+                        ifTrue:
+                            ["/                                    testsWhichPassed add:caseName.
+                            "/                                    testsWhichFailed remove:caseName ifAbsent:nil.
+                            ]
+                        ifFalse:[self testFailed:caseName withResult:result].
+                    errorCountBefore := errorCountAfter.
+                    failureCountBefore := failureCountAfter]] ensure:
+                        [aTestSuite removeDependentFromHierachy:self.
+                        self hidePercentageIndicator.
+                        self displayNormalColorInProgress.].
+            self updateWindow]
 !
 
 runTests
@@ -1056,11 +1056,11 @@
 !TestRunner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.62 2012-08-13 14:23:13 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.63 2012-10-23 19:01:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.62 2012-08-13 14:23:13 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestRunner.st,v 1.63 2012-10-23 19:01:48 cg Exp $'
 !
 
 version_SVN