projects
/
fiveam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed the default suite to T; allow a suite parameter of NIL to mean a test/suite...
[fiveam.git]
/
src
/
test.lisp
diff --git
a/src/test.lisp
b/src/test.lisp
index
3d79595
..
0bfac1f
100644
(file)
--- a/
src/test.lisp
+++ b/
src/test.lisp
@@
-47,8
+47,11
@@
named KEY in the *TEST* hash table."
(ensure-list name)
`(def-test ,name (,@args) ,@body)))
(ensure-list name)
`(def-test ,name (,@args) ,@body)))
-(defmacro def-test (name (&key depends-on (suite nil suite-p) fixture
- (compile-at :run-time) profile)
+(defmacro def-test (name (&key depends-on
+ (suite nil suite-p)
+ fixture
+ (compile-at :run-time)
+ profile)
&body body)
"Create a test named NAME.
&body body)
"Create a test named NAME.
@@
-88,12
+91,18
@@
is compiled."
(let* ((description (or docstring ""))
(body-forms (append decls forms))
(suite-form (if suite-p
(let* ((description (or docstring ""))
(body-forms (append decls forms))
(suite-form (if suite-p
- `(get-test ',suite)
+ (if suite
+ `(get-test ',suite)
+ nil)
'*suite*))
(effective-body (let* ((test-fixture fixture)
(suite-fixture (if suite-p
'*suite*))
(effective-body (let* ((test-fixture fixture)
(suite-fixture (if suite-p
- (fixture (get-test suite))
- (fixture *suite*)))
+ (if suite
+ (fixture (get-test suite :error t))
+ nil)
+ (if *suite*
+ (fixture *suite*)
+ nil)))
(effective-fixture (or test-fixture suite-fixture)))
(if effective-fixture
(destructuring-bind (name &rest args)
(effective-fixture (or test-fixture suite-fixture)))
(if effective-fixture
(destructuring-bind (name &rest args)
@@
-113,6
+122,7
@@
is compiled."
',name))))
(defun register-test (&key name description body suite depends-on compile-at profile)
',name))))
(defun register-test (&key name description body suite depends-on compile-at profile)
+ (remove-from-suites name)
(let ((lambda-name
(format-symbol t "%~A-~A" '#:test name))
(inner-lambda-name
(let ((lambda-name
(format-symbol t "%~A-~A" '#:test name))
(inner-lambda-name
@@
-133,7
+143,8
@@
is compiled."
:description description
:depends-on depends-on
:collect-profiling-info profile))
:description description
:depends-on depends-on
:collect-profiling-info profile))
- (setf (gethash name (tests suite)) name)))
+ (when suite
+ (setf (gethash name (tests (get-test suite :error t))) name))))
(defvar *run-test-when-defined* nil
"When non-NIL tests are run as soon as they are defined.")
(defvar *run-test-when-defined* nil
"When non-NIL tests are run as soon as they are defined.")