projects
/
xlunit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5485: *** empty log message ***
[xlunit.git]
/
assert.lisp
diff --git
a/assert.lisp
b/assert.lisp
index f9ddec259ad0e6fe5c6d18d95510dc35dc9528cb..e2d7356d537653937a544727bf1c4885ad2b8018 100644
(file)
--- a/
assert.lisp
+++ b/
assert.lisp
@@
-2,7
+2,7
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; ID: $Id: assert.lisp,v 1.
9 2003/08/08 00:57:20
kevin Exp $
+;;;; ID: $Id: assert.lisp,v 1.
10 2003/08/10 07:39:33
kevin Exp $
;;;; Purpose: Assert functions for XLUnit
;;;;
;;;; *************************************************************************
;;;; Purpose: Assert functions for XLUnit
;;;;
;;;; *************************************************************************
@@
-34,7
+34,7
@@
(defun assert-eql (v1 v2 &optional message)
(unless (eql v1 v2)
(defun assert-eql (v1 v2 &optional message)
(unless (eql v1 v2)
- (failure-message message "Assert eql: ~S ~S" v1 v2)))
+ (failure-message message "Assert eq
ua
l: ~S ~S" v1 v2)))
(defun assert-not-eql (v1 v2 &optional message)
(when (eql v1 v2)
(defun assert-not-eql (v1 v2 &optional message)
(when (eql v1 v2)
@@
-48,11
+48,11
@@
`(when ,v
(failure-message ,message "Assert false: ~S" ',v)))
`(when ,v
(failure-message ,message "Assert false: ~S" ',v)))
-(defmacro assert-condition (condition form
s
&optional message)
+(defmacro assert-condition (condition form &optional message)
(let ((cond (gensym "COND-")))
`(handler-case
(progn
(let ((cond (gensym "COND-")))
`(handler-case
(progn
- ,form
s
+ ,form
(values))
(t (,cond)
(when (and (typep ,cond 'serious-condition)
(values))
(t (,cond)
(when (and (typep ,cond 'serious-condition)
@@
-66,11
+66,11
@@
"Assert condition ~A, but no condition signaled"
,condition)))))
"Assert condition ~A, but no condition signaled"
,condition)))))
-(defmacro assert-not-condition (condition form
s
&optional message)
+(defmacro assert-not-condition (condition form &optional message)
(let ((cond (gensym "COND-")))
`(handler-case
(progn
(let ((cond (gensym "COND-")))
`(handler-case
(progn
- ,form
s
+ ,form
(values))
(serious-condition (,cond)
(unless (typep ,cond ,condition)
(values))
(serious-condition (,cond)
(unless (typep ,cond ,condition)