--- a/TestCase.st	Tue Feb 25 14:32:36 2014 +0100
+++ b/TestCase.st	Fri Mar 21 18:23:32 2014 +0100
@@ -387,6 +387,7 @@
 
     "
      TestCase should:[ self error ] raise: Error
+     TestCase should:[ 22 ] raise: Error
     "
 ! !
 
@@ -585,11 +586,9 @@
 !
 
 printOn: aStream
-
-        aStream
-                nextPutAll: self class printString;
-                nextPutAll: '>>#';
-                nextPutAll: testSelector
+        self class printOn:aStream.
+        aStream nextPutAll: '>>#'.
+        testSelector printOn:aStream.
 ! !
 
 !TestCase methodsFor:'private'!
@@ -675,13 +674,17 @@
 
 debug
 
-    | testCase outcome result|
+    | testCase outcome result wasProceeded|
 
     [
         result := TestResult stateError.
+        wasProceeded := false.
+
         [
             (testCase := self class selector: testSelector) runCase.
-            result := TestResult statePass.
+            wasProceeded ifFalse:[
+                result := TestResult statePass.
+            ]
         ] sunitOn:(TestResult failure) do: [:ex |
             ex creator == TestSkipped ifTrue:[
                 result := TestResult stateSkip.
@@ -696,10 +699,12 @@
                     enter:ex raiseContext
                     withMessage:(ex description)
                     mayProceed:true.
+                wasProceeded := true.
                 ex proceed. 
             ] ifFalse:[
                 "is there a portable way to open a debugger?"
-                self halt:(ex description)
+                self halt:(ex description).
+                wasProceeded := true.
             ].
         ].
 
@@ -932,15 +937,15 @@
 !TestCase class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.102 2013-04-28 13:41:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.104 2014-03-21 17:23:32 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.102 2013-04-28 13:41:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestCase.st,v 1.104 2014-03-21 17:23:32 stefan Exp $'
 !
 
 version_SVN
-    ^ '§Id: TestCase.st 218 2011-06-13 15:45:06Z vranyj1 §'
+    ^ '$Id: TestCase.st,v 1.104 2014-03-21 17:23:32 stefan Exp $'
 ! !