- (let* ((tmp (gensym))
- (suite-arg (getf (cdr (ensure-list name)) :suite tmp))
- (suite-form (cond
- ((eq tmp suite-arg) '*suite*)
- (t `(get-test ',suite-arg)))))
- (when (consp name)
- (remf (cdr name) :suite))
- (destructuring-bind (name &key depends-on (compile-at :run-time) fixture profile)
- (ensure-list name)
- (declare (type (member :run-time :definition-time) compile-at))
- (let ((description (if (stringp (car body))
- (pop body)
- ""))
- (effective-body (if fixture
- (destructuring-bind (name &rest args)
- (ensure-list fixture)
- `((with-fixture ,name ,args ,@body)))
- body)))
- `(progn
- (setf (get-test ',name) (make-instance 'test-case
- :name ',name
- :runtime-package
- #-ecl ,*package*
- #+ecl (find-package ,(package-name *package*))
- :test-lambda
- (lambda ()
- ,@ (ecase compile-at
- (:run-time `((funcall
- (let ((*package* (find-package ',(package-name *package*))))
- (compile nil '(lambda ()
- ,@effective-body))))))
- (:definition-time effective-body)))
- :description ,description
- :depends-on ',depends-on
- :collect-profiling-info ,profile))
- (setf (gethash ',name (tests ,suite-form)) ',name)
- (when *run-test-when-defined*
- (run! ',name))
- ',name)))))
+ (check-type compile-at (member :run-time :definition-time))
+ (multiple-value-bind (forms decls docstring)
+ (parse-body body :documentation t :whole name)
+ (let* ((description (or docstring ""))
+ (body-forms (append decls forms))
+ (suite-form (if suite-p
+ `(get-test ',suite)
+ (or suite '*suite*)))
+ (effective-body (if fixture
+ (destructuring-bind (name &rest args)
+ (ensure-list fixture)
+ `((with-fixture ,name ,args ,@body-forms)))
+ body-forms)))
+ `(progn
+ (register-test ',name ,description ',effective-body ,suite-form ',depends-on ,compile-at ,profile)
+ (when *run-test-when-defined*
+ (run! ',name))
+ ',name))))
+
+(defun register-test (name description body suite depends-on compile-at profile)
+ (let ((lambda-name
+ (format-symbol t "%~A-~A" '#:test name))
+ (inner-lambda-name
+ (format-symbol t "%~A-~A" '#:inner-test name)))
+ (setf (get-test name)
+ (make-instance 'test-case
+ :name name
+ :runtime-package (find-package (package-name *package*))
+ :test-lambda
+ (eval
+ `(named-lambda ,lambda-name ()
+ ,@(ecase compile-at
+ (:run-time `((funcall
+ (let ((*package* (find-package ',(package-name *package*))))
+ (compile ',inner-lambda-name
+ '(lambda () ,@body))))))
+ (:definition-time body))))
+ :description description
+ :depends-on depends-on
+ :collect-profiling-info profile))
+ (setf (gethash name (tests suite)) name)))