--- a/Tools__TestRunnerEmbedded.st	Sat Aug 20 16:07:15 2011 +0200
+++ b/Tools__TestRunnerEmbedded.st	Sat Aug 20 16:08:08 2011 +0200
@@ -407,64 +407,19 @@
     "/ cg: I really do not want to run them twice to get a debugger 
     "/ - I want to run them either with a debugger coming right away, or not.
 
-    | suiteAndResult suite result|
+    | suiteAndResult suite|
 
     suiteAndResult := self resultHolder value.
     suite := suiteAndResult suite.
-    result := suiteAndResult result.
-
-    suite tests do:[:each | 
-        |errorHappened failureHappened cls|
+    suite run: Tools::AbstractTestRunner newRunWithDebugTestResult.
 
-        errorHappened := failureHappened := false.
-        GenericException 
-            handle:[:ex | 
-                (HaltInterrupt accepts:ex signal) ifFalse:[
-                    ex signal == NoHandlerError ifFalse:[
-                        (TestFailure accepts:ex signal) ifTrue:[
-                            failureHappened := true
-                        ] ifFalse:[
-                            errorHappened := true.
-                        ].
-                    ]
-                ].
-                ex reject.
-            ]
-            do:[ 
-                infoHolder notNil ifTrue:[
-                    infoHolder value:('Running "%1-%2"...' 
-                                    bindWith:each name
-                                    with:each getTestName allBold)
-                ].
-                each debug. 
-                infoHolder notNil ifTrue:[
-                    infoHolder value:('Done.')
-                ]
-            ].
 
-        result failures remove:each ifAbsent:[].
-        result passed remove:each ifAbsent:[].
-        result errors remove:each ifAbsent:[].
-
-        failureHappened ifTrue:[
-            each class rememberErrorTest:each selector.
-            result errors add:each.
-        ] ifFalse:[
-            errorHappened ifTrue:[
-                each class rememberFailedTest:each selector.
-                result failures add:each.
-            ] ifFalse:[
-                each class rememberPassedTest:each selector.
-                result passed add:each.
-            ]
-        ]
-    ]
 
     "/ suiteAndResult suite tests size ~= 1 ifTrue:[^self breakPoint: #jv].
     "/ [suiteAndResult suite tests anyOne debug] fork
 
-    "Modified: / 15-03-2010 / 20:09:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 05-07-2011 / 18:45:43 / cg"
+    "Modified: / 20-08-2011 / 14:31:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !TestRunnerEmbedded methodsFor:'aspects'!
@@ -827,17 +782,18 @@
 
     result := TestResult new.
     suite tests do:[:test |
-        |sel|
+        | sel cls |
 
         sel := test selector.
-        (test class testSelectorPassed:sel) ifTrue:[
-            result passed add:test
+        cls := test class.
+        (cls testSelectorPassed:sel) ifTrue:[
+            result passedOutcomes add: (cls rememberedOutcomeFor: sel)
         ] ifFalse:[
-            (test class testSelectorError:sel) ifTrue:[
-                result errors add:test
+            (cls testSelectorError:sel) ifTrue:[
+                result errorOutcomes add:(cls rememberedOutcomeFor: sel)
             ] ifFalse:[
-                (test class testSelectorFailed:sel) ifTrue:[
-                    result failures add:test
+                (cls testSelectorFailed:sel) ifTrue:[
+                    result failureOutcomes add:(cls rememberedOutcomeFor: sel)
                 ]
             ]
         ]
@@ -846,6 +802,7 @@
 
     "Created: / 15-03-2010 / 19:46:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 02-08-2011 / 18:20:00 / cg"
+    "Modified: / 20-08-2011 / 14:30:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 suiteForRun
@@ -994,11 +951,11 @@
 !TestRunnerEmbedded class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.15 2011-08-09 21:57:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.16 2011-08-20 14:08:08 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.15 2011-08-09 21:57:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunnerEmbedded.st,v 1.16 2011-08-20 14:08:08 vrany Exp $'
 !
 
 version_SVN