X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=assert.lisp;h=6a387514f07e907f1ed33a65578b2ef819ae043b;hb=eec979fc057d3ff9bbc712235a7ca4dabf937b71;hp=25db1e5e3ca93d8ab70392aeef29e8e4f4a6d237;hpb=3d99efdf0959b199cc4b2e020c7692f650094f73;p=xlunit.git

diff --git a/assert.lisp b/assert.lisp
index 25db1e5..6a38751 100644
--- a/assert.lisp
+++ b/assert.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:       $Id: assert.lisp,v 1.6 2003/08/05 22:56:25 kevin Exp $
+;;;; ID:       $Id$
 ;;;; Purpose:  Assert functions for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -34,7 +34,7 @@
 
 (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)
@@ -47,3 +47,32 @@
 (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))))))