added: #testSelector:result:
authorvrany
Sat, 20 Aug 2011 17:20:00 +0200
changeset 391 fb104ea5136f
parent 390 c2c3895aabd6
child 392 41311ff867c5
added: #testSelector:result: changed:5 methods
TestCase.st
--- a/TestCase.st	Sat Aug 20 16:10:20 2011 +0200
+++ b/TestCase.st	Sat Aug 20 17:20:00 2011 +0200
@@ -142,12 +142,9 @@
 rememberedOutcomeFor: selector
 
     lastOutcomes isNil ifTrue:[^nil].
-    lastOutcomes do:[:outcome|
-        outcome testCase selector == selector ifTrue:[
-            ^outcome
-        ].
-    ].
-    ^nil
+    ^lastOutcomes 
+        detect: [:outcome| outcome testCase selector == selector]
+        ifNone:[nil].
 
     "Created: / 20-08-2011 / 14:27:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -168,47 +165,37 @@
         ^'4.0'
 !
 
-testSelectorError:selector
+testSelector:selector result: result
 
     lastOutcomes isNil ifTrue:[^false].
-    lastOutcomes do:[:each|
-        (each testCase class == self 
-            and:[each testCase selector == selector
-                and:[each result == #error]]) ifTrue:[
-                   ^true
-                ].                        
-    ].
-    ^false
+    ^(lastOutcomes 
+        detect:[:each|
+            each testCase class == self
+                and:[each testCase selector == selector
+                    and:[each result == result]]
+        ]
+        ifNone: [nil]) notNil
+
+    "Created: / 20-08-2011 / 16:15:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testSelectorError:selector
+
+    ^self testSelector: selector result: #error
 
     "Created: / 15-03-2010 / 19:44:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 testSelectorFailed:selector
 
-    lastOutcomes isNil ifTrue:[^false].
-    lastOutcomes do:[:each|
-        (each testCase class == self 
-            and:[each testCase selector == selector
-                and:[each result == #fail]]) ifTrue:[
-                   ^true
-                ].                        
-    ].
-    ^false
+    ^self testSelector: selector result: #fail
 
-    "Modified: / 20-08-2011 / 13:02:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-08-2011 / 16:16:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 testSelectorPassed:selector
 
-    lastOutcomes isNil ifTrue:[^false].
-    lastOutcomes do:[:each|
-        (each testCase class == self 
-            and:[each testCase selector == selector
-                and:[each result == #pass]]) ifTrue:[
-                   ^true
-                ].                        
-    ].
-    ^false
+   ^self testSelector: selector result: #pass
 
     "Created: / 15-03-2010 / 17:58:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -286,19 +273,6 @@
     "Created: / 15-03-2010 / 19:15:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-removeSelector: selector from: collection
-
-    "Removes given selector from collection. Answers
-     true iff selector was really removed"
-
-    collection ifNil:[^false]." trivial case "
-    ^(collection includes: selector)
-        ifTrue:[collection remove: selector. true]
-        ifFalse:[false]
-
-    "Created: / 15-03-2010 / 18:05:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 testSelectors
         "The API method is allTestSelectors which now includes #shouldInheritSelectors and so handles all cases.  Unlike that method, this does not guarantee to return a sorted ordered collection."
 
@@ -348,13 +322,11 @@
 !
 
 runTests
-    |result|
 
-    result := self suite run.
-    self rememberResult:result.
-    ^ result
+    ^self suite run
 
     "Modified: / 30-07-2011 / 09:26:11 / cg"
+    "Modified: / 20-08-2011 / 16:14:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 shouldInheritSelectors
@@ -790,11 +762,11 @@
 !TestCase class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.77 2011-08-20 14:10:20 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.78 2011-08-20 15:20:00 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.77 2011-08-20 14:10:20 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.78 2011-08-20 15:20:00 vrany Exp $'
 !
 
 version_SVN