X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ftest.lisp;h=f9377cfb976f5946373e6bf2ca68c8bf29d625a1;hb=ebf1d93971db80410bb860338eb6f79b9de68b23;hp=e046859f304c05782da044ad3518fc048971ef95;hpb=1b24abf09e9fbb2a23c25a9583e5547514482f1b;p=fiveam.git

diff --git a/src/test.lisp b/src/test.lisp
index e046859..f9377cf 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -1,6 +1,6 @@
-;; -*- lisp -*-
+;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
 
-(in-package :it.bese.FiveAM)
+(in-package :it.bese.fiveam)
 
 ;;;; * Tests
 
@@ -11,11 +11,20 @@
 ;;;; collection of checks which can be run and a test suite is a named
 ;;;; collection of tests and test suites.
 
-(deflookup-table test
-  :at-redefinition nil
-  :documentation "Lookup table mapping test (and test suite)
+(defvar *test*
+  (make-hash-table :test 'eql)
+  "Lookup table mapping test (and test suite)
   names to objects.")
 
+(defun get-test (key &optional default)
+  (gethash key *test* default))
+
+(defun (setf get-test) (value key)
+  (setf (gethash key *test*) value))
+
+(defun rem-test (key)
+  (remhash key *test*))
+
 (defun test-names ()
   (loop for test being the hash-keys of *test*
         collect test))
@@ -45,47 +54,83 @@ If DEPENDS-ON is a symbol it is interpreted as `(AND
 ,depends-on), this is accomadate the common case of one test
 depending on another.
 
-FIXTURE specifies a fixtrue to wrap the body in.
+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)))
+
+(defmacro def-test (name (&key depends-on (suite '*suite* suite-p) fixture
+                            (compile-at :run-time) profile)
+                    &body body)
+  "Create a test named NAME.
+
+NAME is the symbol which names the test.
+
+DEPENDS-ON is a list of the form:
+
+ (AND . test-names) - This test is run only if all of the tests
+ in TEST-NAMES have passed, otherwise a single test-skipped
+ result is generated.
+
+ (OR . test-names) - If any of TEST-NAMES has passed this test is
+ run, otherwise a test-skipped result is generated.
+
+ (NOT test-name) - This is test is run only if TEST-NAME failed.
+
+AND, OR and NOT can be combined to produce complex dependencies.
+
+If DEPENDS-ON is a symbol it is interpreted as `(AND
+,depends-on), this is accomadate the common case of one test
+depending on another.
+
+FIXTURE specifies a fixture to wrap the body in.
 
 If PROFILE is T profiling information will be collected as well."
-  (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 (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)))
 
 (defvar *run-test-when-defined* nil
   "When non-NIL tests are run as soon as they are defined.")