X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=assert.lisp;h=e2d7356d537653937a544727bf1c4885ad2b8018;hb=0114e93940d17c3dd840f37a81d6fb0da66e7a25;hp=d46eaeb530e469e85e3f70dfff4afde0a947ac64;hpb=e6a0ad7329d3ce497ce8c9f3d0d37811b2da4811;p=xlunit.git

diff --git a/assert.lisp b/assert.lisp
index d46eaeb..e2d7356 100644
--- a/assert.lisp
+++ b/assert.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:       $Id: assert.lisp,v 1.5 2003/08/04 16:42:27 kevin Exp $
+;;;; ID:       $Id: assert.lisp,v 1.10 2003/08/10 07:39:33 kevin Exp $
 ;;;; Purpose:  Assert functions for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -14,12 +14,14 @@
   ((message :initform nil :initarg :message :accessor message))
   (:documentation "Base class for all test failures."))
 
+(defmethod print-object ((obj assertion-failed) stream)
+  (print-unreadable-object (obj stream :type t :identity nil)
+    (apply #'format stream (simple-condition-format-control obj)
+	   (simple-condition-format-arguments obj))))
 
 (defun failure-message (message &optional format-str &rest args)
   "Signal a test failure and exit the test."
-  (signal 'assertion-failed
-	  :message message
-	  :format-control format-str
+  (signal 'assertion-failed :message message :format-control format-str
 	  :format-arguments args))
 
 (defun failure (format-str &rest args)
@@ -28,16 +30,49 @@
 
 (defun assert-equal (v1 v2 &optional message)
   (unless (equal v1 v2)
-    (failure-message message "Test equal: ~S ~S" v1 v2)))
+    (failure-message message "Assert equal: ~S ~S" v1 v2)))
 
 (defun assert-eql (v1 v2 &optional message)
   (unless (eql v1 v2)
-    (failure-message message "Test 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)
+    (failure-message message "Assert not eql: ~S ~S" v1 v2)))
 
 (defmacro assert-true (v &optional message)
   `(unless ,v
-    (failure-message message "Not true: ~S" ',v)))
+    (failure-message ,message "Assert true: ~S" ',v)))
 
 (defmacro assert-false (v &optional message)
   `(when ,v
-     (failure-message message "Not false: ~S" ',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))))))