X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=assert.lisp;h=25db1e5e3ca93d8ab70392aeef29e8e4f4a6d237;hb=274fc70849b8122372f0e114a917f23852ce7f20;hp=269e797af812df4c46f63a38e30d922d46b10e9b;hpb=8133177de9c5d202520bd83b5e797ef7a39942ad;p=xlunit.git

diff --git a/assert.lisp b/assert.lisp
index 269e797..25db1e5 100644
--- a/assert.lisp
+++ b/assert.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; ID:       $Id: assert.lisp,v 1.2 2003/08/04 12:16:13 kevin Exp $
+;;;; ID:       $Id: assert.lisp,v 1.6 2003/08/05 22:56:25 kevin Exp $
 ;;;; Purpose:  Assert functions for XLUnit
 ;;;;
 ;;;; *************************************************************************
@@ -10,32 +10,40 @@
 (in-package #:xlunit)
 
 
-;;; Assertions
-
-(define-condition test-failure-condition (simple-condition) 
-  ((msg :initform nil :initarg :msg :accessor msg))
+(define-condition assertion-failed (simple-condition) 
+  ((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 (format-str &rest args)
+(defun failure-message (message &optional format-str &rest args)
   "Signal a test failure and exit the test."
-  (signal 'test-failure-condition
-	  :format-control format-str
+  (signal 'assertion-failed :message message :format-control format-str
 	  :format-arguments args))
 
-(defmacro test-assert (test &optional msg)
-  `(unless ,test
-    (failure "Test assertion: ~s" ',test)))
+(defun failure (format-str &rest args)
+  "Signal a test failure and exit the test."
+  (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 "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 "Assert eql: ~S ~S" v1 v2)))
 
-(defun assert-true (v &optional msg)
-  (unless v
-    (failure "Test true: ~s [~A]" v (if msg msg ""))))
+(defun assert-not-eql (v1 v2 &optional message)
+  (when (eql v1 v2)
+    (failure-message message "Assert not eql: ~S ~S" v1 v2)))
 
-(defun assert-false (v &optional msg)
-  (when v
-    (failure "Test false ~A" (if msg msg ""))))
+(defmacro assert-true (v &optional message)
+  `(unless ,v
+    (failure-message ,message "Assert true: ~S" ',v)))
 
+(defmacro assert-false (v &optional message)
+  `(when ,v
+     (failure-message ,message "Assert false: ~S" ',v)))