;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; ID: $Id: assert.lisp,v 1.8 2003/08/06 14:51:01 kevin Exp $
+;;;; ID: $Id: assert.lisp,v 1.9 2003/08/08 00:57:20 kevin Exp $
;;;; Purpose: Assert functions for XLUnit
;;;;
;;;; *************************************************************************
`(when ,v
(failure-message ,message "Assert false: ~S" ',v)))
-(defmacro assert-condition (condition v &optional message)
-
- )
+(defmacro assert-condition (condition forms &optional message)
+ (let ((cond (gensym "COND-")))
+ `(handler-case
+ (progn
+ ,forms
+ (values))
+ (t (,cond)
+ (when (and (typep ,cond 'serious-condition)
+ (not (typep ,cond ,condition)))
+ (failure-message
+ ,message
+ "Assert condition ~A, but signaled condition ~A"
+ ,condition ,cond)))
+ (:no-error ()
+ (failure-message ,message
+ "Assert condition ~A, but no condition signaled"
+ ,condition)))))
-(defmacro assert-not-condition (condition v &optional message)
- )
+(defmacro assert-not-condition (condition forms &optional message)
+ (let ((cond (gensym "COND-")))
+ `(handler-case
+ (progn
+ ,forms
+ (values))
+ (serious-condition (,cond)
+ (unless (typep ,cond ,condition)
+ (failure-message ,message "Assert not condition ~A"
+ ,condition))))))