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

diff --git a/assert.lisp b/assert.lisp
index d46eaeb..25db1e5 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.6 2003/08/05 22:56:25 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,20 @@
 
 (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 eql: ~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)))