X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ftest.lisp;h=4d73432276bf985ad2ee6602723d588f2b7c98f9;hb=35dc0e063d9f601afdc1202e4724628525e723f0;hp=9289c888a31b00218f4d77a247ca21af34e2cf73;hpb=c9c5c68ee1fa066834633b342984484c91adbbfe;p=fiveam.git

diff --git a/src/test.lisp b/src/test.lisp
index 9289c88..4d73432 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -11,6 +11,8 @@
 ;;;; collection of checks which can be run and a test suite is a named
 ;;;; collection of tests and test suites.
 
+(declaim (special *suite*))
+
 (defvar *test*
   (make-hash-table :test 'eql)
   "Lookup table mapping test (and test suite)
@@ -26,8 +28,7 @@
   (remhash key *test*))
 
 (defun test-names ()
-  (loop for test being the hash-keys of *test*
-        collect test))
+  (hash-table-keys *test*))
 
 (defmacro test (name &body body)
   "Create a test named NAME. If NAME is a list it must be of the
@@ -57,8 +58,6 @@ depending on another.
 FIXTURE specifies a fixture to wrap the body in.
 
 If PROFILE is T profiling information will be collected as well."
-  (simple-style-warning "~A is OBSOLETE! Use ~A instead."
-                        'test 'def-test)
   (destructuring-bind (name &rest args)
       (ensure-list name)
     `(def-test ,name (,@args) ,@body)))
@@ -90,44 +89,48 @@ depending on another.
 FIXTURE specifies a fixture to wrap the body in.
 
 If PROFILE is T profiling information will be collected as well."
-  (let ((suite-form
-          (if suite-p
-              `(get-test ',suite)
-              (or suite '*suite*))))
-    (check-type compile-at (member :run-time :definition-time))
-    (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))
-          (lambda-name
-            (format-symbol t "%~A-~A" '#:test name))
-          (inner-lambda-name
-            (format-symbol t "%~A-~A" '#:inner-test 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
-         (setf (get-test ',name)
-               (make-instance 'test-case
-                              :name ',name
-                              :runtime-package (find-package ,(package-name *package*))
-                              :test-lambda
-                              (named-lambda ,lambda-name ()
-                                ,@ (ecase compile-at
-                                     (:run-time `((funcall
-                                                   (let ((*package* (find-package ',(package-name *package*))))
-                                                     (compile ',inner-lambda-name
-                                                              '(lambda () ,@effective-body))))))
-                                     (:definition-time effective-body)))
-                              :description ,description
-                              :depends-on ',depends-on
-                              :collect-profiling-info ,profile))
-         (setf (gethash ',name (tests ,suite-form)) ',name)
+         (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)))
+
 (defvar *run-test-when-defined* nil
   "When non-NIL tests are run as soon as they are defined.")