;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; ID: $Id: assert.lisp,v 1.6 2003/08/05 22:56:25 kevin Exp $
+;;;; ID: $Id: assert.lisp,v 1.10 2003/08/10 07:39:33 kevin Exp $
;;;; Purpose: Assert functions for XLUnit
;;;;
;;;; *************************************************************************
(defun assert-eql (v1 v2 &optional message)
(unless (eql v1 v2)
- (failure-message message "Assert eql: ~S ~S" v1 v2)))
+ (failure-message message "Assert equal: ~S ~S" v1 v2)))
(defun assert-not-eql (v1 v2 &optional message)
(when (eql v1 v2)
(defmacro assert-false (v &optional message)
`(when ,v
(failure-message ,message "Assert false: ~S" ',v)))
+
+(defmacro assert-condition (condition form &optional message)
+ (let ((cond (gensym "COND-")))
+ `(handler-case
+ (progn
+ ,form
+ (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 form &optional message)
+ (let ((cond (gensym "COND-")))
+ `(handler-case
+ (progn
+ ,form
+ (values))
+ (serious-condition (,cond)
+ (unless (typep ,cond ,condition)
+ (failure-message ,message "Assert not condition ~A"
+ ,condition))))))