changed: #run:beforeEachDo:afterEachDo:
oops: before/after actions were called twice
--- a/TestSuite.st Tue Jul 05 18:24:33 2011 +0200
+++ b/TestSuite.st Wed Jul 06 14:29:08 2011 +0200
@@ -20,12 +20,6 @@
yourself
! !
-!TestSuite class methodsFor:'others'!
-
-version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/sunit/TestSuite.st,v 1.20 2011-07-05 15:45:47 cg Exp $'
-! !
-
!TestSuite methodsFor:'accessing'!
addTest: aTest
@@ -148,26 +142,26 @@
class := name ifNotNil:[ Smalltalk classNamed:name ] ifNil:[ nil ].
class ifNotNil:[ class perform:#setUp ifNotUnderstood:nil ].
[
- self tests do:[:each |
- self sunitChanged:each.
- block1 value:each value:aResult.
- each
- run:aResult
- beforeEachDo:block1
- afterEachDo:block2.
+ self tests do:[:each |
+ self sunitChanged:each.
+ "/ block1 value:each value:aResult. - do not call it twice
+ each
+ run:aResult
+ beforeEachDo:block1
+ afterEachDo:block2.
- "/ each run: aResult.
-
- block2 value:each value:aResult.
- ].
+ "/ each run: aResult.
+ "/ block2 value:each value:aResult. - do not call it twice
+ ].
] ensure:[
- self resources do:[:e |
- e reset
- ]
+ self resources do:[:e |
+ e reset
+ ]
].
class ifNotNil:[ class perform:#tearDown ifNotUnderstood:nil ]
"Modified: / 19-03-2010 / 08:02:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-07-2011 / 14:24:45 / cg"
!
run:aResult beforeEachTestCaseDo:block1 afterEachTestCaseDo:block2
@@ -227,8 +221,8 @@
!TestSuite class methodsFor:'documentation'!
-version
- ^ '$Header: /cvs/stx/stx/goodies/sunit/TestSuite.st,v 1.20 2011-07-05 15:45:47 cg Exp $'
+version_CVS
+ ^ '$Header: /cvs/stx/stx/goodies/sunit/TestSuite.st,v 1.21 2011-07-06 12:29:08 cg Exp $'
!
version_SVN