;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; ID: $Id: assert.lisp,v 1.3 2003/08/04 12:28:46 kevin Exp $
+;;;; ID: $Id: assert.lisp,v 1.6 2003/08/05 22:56:25 kevin Exp $
;;;; Purpose: Assert functions for XLUnit
;;;;
;;;; *************************************************************************
(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-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 'test-failure-condition
- :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))
-
-(defmacro test-assert (test &optional msg)
- `(unless ,test
- (failure-msg ,msg "Test assertion: ~s" ',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-msg msg "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-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 msg)
+(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)))