projects
/
fiveam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: Store *package* at definition time for tests and rebind it at runtime
[fiveam.git]
/
src
/
suite.lisp
diff --git
a/src/suite.lisp
b/src/suite.lisp
index
64223e0
..
e7aab24
100644
(file)
--- a/
src/suite.lisp
+++ b/
src/suite.lisp
@@
-6,7
+6,7
@@
;;;; Test suites allow us to collect multiple tests into a single
;;;; object and run them all using asingle name. Test suites do not
;;;; Test suites allow us to collect multiple tests into a single
;;;; object and run them all using asingle name. Test suites do not
-;;;; affect teh way test are run northe way the results are handled,
+;;;; affect the way test are run nor the way the results are handled,
;;;; they are simply a test organizing group.
;;;; Test suites can contain both tests and other test suites. Running
;;;; they are simply a test organizing group.
;;;; Test suites can contain both tests and other test suites. Running
@@
-20,7
+20,9
@@
"Define a new test-suite named NAME.
IN (a symbol), if provided, causes this suite te be nested in the
"Define a new test-suite named NAME.
IN (a symbol), if provided, causes this suite te be nested in the
-suite named by IN."
+suite named by IN. NB: This macro is built on top of make-suite,
+as such it, like make-suite, will overrwrite any existing suite
+named NAME."
`(progn
(make-suite ',name
,@(when description `(:description ,description))
`(progn
(make-suite ',name
,@(when description `(:description ,description))
@@
-28,7
+30,9
@@
suite named by IN."
',name))
(defun make-suite (name &key description in)
',name))
(defun make-suite (name &key description in)
- "Create a new test suite object."
+ "Create a new test suite object.
+
+Overides any existing suite named NAME."
(let ((suite (make-instance 'test-suite :name name)))
(when description
(setf (description suite) description))
(let ((suite (make-instance 'test-suite :name name)))
(when description
(setf (description suite) description))
@@
-55,14
+59,22
@@
after the execution of this form are, unless specified otherwise,
in the test-suite named SUITE-NAME.
See also: DEF-SUITE *SUITE*"
in the test-suite named SUITE-NAME.
See also: DEF-SUITE *SUITE*"
+ `(%in-suite ,suite-name))
+
+(defmacro in-suite* (suite-name &key in)
+ "Just like in-suite, but silently creates missing suites."
+ `(%in-suite ,suite-name :in ,in :fail-on-error nil))
+
+(defmacro %in-suite (suite-name &key (fail-on-error t) in)
(with-unique-names (suite)
`(progn
(if-bind ,suite (get-test ',suite-name)
(setf *suite* ,suite)
(progn
(with-unique-names (suite)
`(progn
(if-bind ,suite (get-test ',suite-name)
(setf *suite* ,suite)
(progn
- (cerror "Create a new suite named ~A."
- "Unkown suite ~A." ',suite-name)
- (setf (get-test ',suite-name) (make-suite ',suite-name)
+ (when ,fail-on-error
+ (cerror "Create a new suite named ~A."
+ "Unkown suite ~A." ',suite-name))
+ (setf (get-test ',suite-name) (make-suite ',suite-name :in ',in)
*suite* (get-test ',suite-name))))
',suite-name)))
*suite* (get-test ',suite-name))))
',suite-name)))