X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=assert.lisp;h=ec82b4c13353947dd9bf61cb0f0203c51a370454;hb=HEAD;hp=e2d7356d537653937a544727bf1c4885ad2b8018;hpb=b889ac95ba72db60faa35fe08b360aaa33a795ed;p=xlunit.git diff --git a/assert.lisp b/assert.lisp index e2d7356..ec82b4c 100644 --- a/assert.lisp +++ b/assert.lisp @@ -2,7 +2,7 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; ID: $Id: assert.lisp,v 1.10 2003/08/10 07:39:33 kevin Exp $ +;;;; ID: $Id$ ;;;; Purpose: Assert functions for XLUnit ;;;; ;;;; ************************************************************************* @@ -10,19 +10,19 @@ (in-package #:xlunit) -(define-condition assertion-failed (simple-condition) +(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)))) + (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 - :format-arguments args)) + :format-arguments args)) (defun failure (format-str &rest args) "Signal a test failure and exit the test." @@ -51,28 +51,28 @@ (defmacro assert-condition (condition form &optional message) (let ((cond (gensym "COND-"))) `(handler-case - (progn - ,form - (values)) + (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))) + (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))))) + (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)) + (progn + ,form + (values)) (serious-condition (,cond) - (unless (typep ,cond ,condition) - (failure-message ,message "Assert not condition ~A" - ,condition)))))) + (unless (typep ,cond ,condition) + (failure-message ,message "Assert not condition ~A" + ,condition))))))