X-Git-Url: http://git.kpe.io/?p=xlunit.git;a=blobdiff_plain;f=assert.lisp;h=ec82b4c13353947dd9bf61cb0f0203c51a370454;hp=8307e2fbfd82cb68ab5824e4f81cdaffd7a3fcd7;hb=HEAD;hpb=318cda1a328e9d99af2270c73cb13262e485a1ff

diff --git a/assert.lisp b/assert.lisp
index 8307e2f..ec82b4c 100644
--- a/assert.lisp
+++ b/assert.lisp
@@ -2,42 +2,77 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:     assert.lisp
+;;;; ID:       $Id$
 ;;;; Purpose:  Assert functions for XLUnit
-;;;; Author:   Kevin Rosenberg
 ;;;;
-;;;; $Id: assert.lisp,v 1.1 2003/08/04 12:01:54 kevin Exp $
 ;;;; *************************************************************************
 
 (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
-	  :format-arguments args))
+  (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 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 "Assert true: ~S" ',v)))
 
-(defun assert-true (v &optional msg)
-  (unless v
-    (failure "Test true: ~s [~A]" v (if msg msg ""))))
+(defmacro assert-false (v &optional message)
+  `(when ,v
+     (failure-message ,message "Assert false: ~S" ',v)))
 
-(defun assert-false (v &optional msg)
-  (when v
-    (failure "Test false ~A" (if msg msg ""))))
+(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))))))