r5467: *** empty log message ***

[xlunit.git] / tcase.lisp

diff --git a/tcase.lisp b/tcase.lisp
index 4c13e1eefc05871c2516ffb87701b39094ec9780..5761a9facbe6e6c23eba80f082254599532454ef 100644 (file)
--- a/tcase.lisp
+++ b/tcase.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:      $Id: tcase.lisp,v 1.5 2003/08/06 14:51:01 kevin Exp $
+;;;; ID:      $Id: tcase.lisp,v 1.6 2003/08/08 00:57:20 kevin Exp $
 ;;;; Purpose: Test fixtures for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -72,35 +72,18 @@ that the setup method did for this instance."))
   (set-up test)
   (unwind-protect
       (run-test test)
-    (tear-down test))
-  (values))
+    (tear-down test)))
 
 (defmethod run-test ((test test-case))
     (funcall (method-body test)))
 
-(defmethod run-protected ((test test-case) res 
-                         &key (handle-errors t) test-condition)
+(defmethod run-protected ((test test-case) res &key (handle-errors t))
   (if handle-errors
       (handler-case
          (run-base test)
        (assertion-failed (condition)
          (add-failure res test condition))
-       (t (condition)
-         (when (and test-condition
-                    (not (typep condition test-condition)))
-           (add-failure res test
-                        (make-instance 'assertion-failed
-                          :format-control
-                          "Assert condition ~A, but condition ~A signaled"
-                          :format-arguments
-                          (list test-condition condition)))))
        (serious-condition (condition)
-         (add-error res test condition))
-       (:no-error ()
-         (when test-condition
-           (add-failure res test
-                        (make-instance 'assertion-failed
-                          :format-control "Assert condition ~A, but no condition signaled"
-                          :format-arguments (list test-condition))))))
-    (run-base test))
+         (add-error res test condition)))
+      (run-base test))
   res)