r5467: *** empty log message ***

[xlunit.git] / assert.lisp

diff --git a/assert.lisp b/assert.lisp
index fa2f100e92a216cf3bec1e0a4872b301e8e564e6..f9ddec259ad0e6fe5c6d18d95510dc35dc9528cb 100644 (file)
--- a/assert.lisp
+++ b/assert.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:       $Id: assert.lisp,v 1.4 2003/08/04 16:13:58 kevin Exp $
+;;;; ID:       $Id: assert.lisp,v 1.9 2003/08/08 00:57:20 kevin Exp $
 ;;;; Purpose:  Assert functions for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -11,33 +11,68 @@
 
 
 (define-condition assertion-failed (simple-condition) 
-  ((msg :initform nil :initarg :msg :accessor msg))
+  ((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-msg (msg &optional format-str &rest args)
+(defun failure-message (message &optional format-str &rest args)
   "Signal a test failure and exit the test."
-  (signal 'assertion-failed
-         :msg msg
-         :format-control format-str
+  (signal 'assertion-failed :message message :format-control format-str
          :format-arguments args))
 
 (defun failure (format-str &rest args)
   "Signal a test failure and exit the test."
-  (apply #'failure-msg nil format-str args))
+  (apply #'failure-message nil format-str args))
 
-(defun assert-equal (v1 v2 &optional msg)
+(defun assert-equal (v1 v2 &optional message)
   (unless (equal v1 v2)
-    (failure-msg msg "Test equal: ~S ~S" v1 v2)))
+    (failure-message message "Assert equal: ~S ~S" v1 v2)))
 
-(defun assert-eql (v1 v2 &optional msg)
+(defun assert-eql (v1 v2 &optional message)
   (unless (eql v1 v2)
-    (failure-msg msg "Test eql: ~S ~S" v1 v2)))
+    (failure-message message "Assert eql: ~S ~S" v1 v2)))
 
-(defmacro assert-true (v &optional msg)
+(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-msg msg "Not true: ~S" ',v)))
+    (failure-message ,message "Assert true: ~S" ',v)))
 
-(defmacro assert-false (v &optional msg)
+(defmacro assert-false (v &optional message)
   `(when ,v
-     (failure-msg msg "Not false: ~S" ',v)))
+     (failure-message ,message "Assert false: ~S" ',v)))
+
+(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 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))))))