X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ftest.lisp;h=33fa7c8a1019f6775a4d7767dfde4e051e7c5b36;hb=df94e5e6fa7251673b060fa4341bbf740358633e;hp=ccdcb0a49363dd3267982e6ce4a3d40c185d0caf;hpb=4f250825a6c2a0686666277ab394c31984f62e0c;p=fiveam.git

diff --git a/src/test.lisp b/src/test.lisp
index ccdcb0a..33fa7c8 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -12,6 +12,7 @@
 ;;;; collection of tests and test suites.
 
 (deflookup-table test
+  :at-redefinition nil
   :documentation "Lookup table mapping test (and test suite)
   names to objects.")
 
@@ -23,7 +24,7 @@
   "Create a test named NAME. If NAME is a list it must be of the
 form:
 
-  (name &key depends-on suite)
+  (name &key depends-on suite fixture compile-at)
 
 NAME is the symbol which names the test.
 
@@ -44,19 +45,33 @@ 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.
 
-SUITE defaults to the current value of *SUITE*."
-  (destructuring-bind (name &key depends-on (suite nil suite-supplied-p))
+SUITE defaults to the current value of *SUITE*.
+
+FIXTURE specifies a fixtrue to wrap the body in."
+  (destructuring-bind (name &key depends-on (suite nil suite-supplied-p)
+                                 (compile-at :run-time) fixture)
       (ensure-list name)
-    (let (description)
-      (setf description (if (stringp (car body))
-			    (pop body)
-			    ""))
+    (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 ,*package*
                                                 :test-lambda
                                                 (lambda ()
-                                                  (funcall (compile nil '(lambda () ,@body))))
+                                                  ,@ (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))
 	 ,(if suite-supplied-p