--- a/SUnitTest.st	Fri Dec 14 00:30:32 2001 +0100
+++ b/SUnitTest.st	Fri Dec 14 00:40:21 2001 +0100
@@ -14,6 +14,14 @@
 Two tests should fail.'
 ! !
 
+!SUnitTest class methodsFor:'Testing'!
+
+shouldInheritSelectors
+	"answer true to inherit selectors from superclasses"
+
+	^false
+! !
+
 !SUnitTest methodsFor:'Accessing'!
 
 hasRun
@@ -26,6 +34,15 @@
 
 !SUnitTest methodsFor:'Private'!
 
+assertForTestResult: aResult runCount: aRunCount passed: aPassedCount failed: aFailureCount errors: anErrorCount
+
+	self
+		assert: aResult runCount = aRunCount;
+		assert: aResult passedCount = aPassedCount;
+		assert: aResult failureCount = aFailureCount;
+		assert: aResult errorCount = anErrorCount
+!
+
 error
 	3 zork
 
@@ -70,9 +87,13 @@
 	suite addTest: (error := self class selector: #error).
 	suite addTest: (failure := self class selector: #fail).
 	result := suite run.
-	self assert: result defects asArray = (Array with: error with: failure)
-
-    "Modified: / 21.6.2000 / 10:23:04 / Sames"
+	self assert: result defects asArray = (Array with: error with: failure).
+	self
+		assertForTestResult: result
+		runCount: 2
+		passed: 0
+		failed: 1
+		errors: 1
 !
 
 testDialectLocalizedException
@@ -87,10 +108,12 @@
 	| case result |
 	case := self class selector: #error.
 	result := case run.
-	self assert: result correctCount = 0.
-	self assert: result failureCount = 0.
-	self assert: result runCount = 1.
-	self assert: result errorCount = 1
+	self
+		assertForTestResult: result
+		runCount: 1
+		passed: 0
+		failed: 0
+		errors: 1
 !
 
 testException
@@ -103,9 +126,12 @@
 	| case result |
 	case := self class selector: #fail.
 	result := case run.
-	self assert: result correctCount = 0.
-	self assert: result failureCount = 1.
-	self assert: result runCount = 1
+	self
+		assertForTestResult: result
+		runCount: 1
+		passed: 0
+		failed: 1
+		errors: 0
 !
 
 testFailureDebugUI
@@ -137,8 +163,12 @@
 	| case result |
 	case := self class selector: #noop.
 	result := case run.
-	self assert: result runCount = 1.
-	self assert: result correctCount = 1
+	self
+		assertForTestResult: result
+		runCount: 1
+		passed: 1
+		failed: 0
+		errors: 0
 !
 
 testRunning
@@ -157,14 +187,18 @@
 	suite := TestSuite new.
 	suite addTest: (self class selector: #noop).
 	suite addTest: (self class selector: #fail).
+	suite addTest: (self class selector: #error).
 	result := suite run.
-	self assert: result runCount = 2.
-	self assert: result correctCount = 1.
-	self assert: result failureCount = 1
+	self
+		assertForTestResult: result
+		runCount: 3
+		passed: 1
+		failed: 1
+		errors: 1
 ! !
 
 !SUnitTest class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/SUnitTest.st,v 1.6 2001-12-13 22:50:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/SUnitTest.st,v 1.7 2001-12-13 23:40:21 cg Exp $'
 ! !