"Define a new test-suite named NAME.
IN (a symbol), if provided, causes this suite te be nested in the
-suite named by IN."
- `(progn
+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."
+ `(eval-when (:compile-toplevel :load-toplevel :execute)
(make-suite ',name
- ,@(when description `(:description ,description))
- ,@(when in `(:in ',in)))
+ ,@(when description `(:description ,description))
+ ,@(when in `(:in ',in)))
',name))
+(defmacro def-suite* (name &rest def-suite-args)
+ `(progn
+ (def-suite ,name ,@def-suite-args)
+ (in-suite ,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))
in the test-suite named SUITE-NAME.
See also: DEF-SUITE *SUITE*"
+ `(eval-when (:compile-toplevel :load-toplevel :execute)
+ (%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
- (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)))