X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest.lisp;h=2712d6a5ba439361d1e955dd753c09582fd43882;hb=d58c9adefaafa525332590fb38f9faefa4490612;hp=ab0feeb6567c827836f1c1cae9d216cc6f68b7c6;hpb=55740edc3e2b3444e7e17978f68df8eced2b19e7;p=fiveam.git

diff --git a/src/test.lisp b/src/test.lisp
index ab0feeb..2712d6a 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -1,4 +1,4 @@
-;; -*- lisp -*-
+;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
 
 (in-package :it.bese.fiveam)
 
@@ -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))
@@ -65,19 +74,23 @@ If PROFILE is T profiling information will be collected as well."
                                 (destructuring-bind (name &rest args)
                                     (ensure-list fixture)
                                   `((with-fixture ,name ,args ,@body)))
-                                body)))
+                                body))
+            (lambda-name
+              (format-symbol t "%~A-~A" '#:test name))
+            (inner-lambda-name
+              (format-symbol t "%~A-~A" '#:inner-test name)))
         `(progn
            (setf (get-test ',name)
                  (make-instance 'test-case
                                 :name ',name
                                 :runtime-package (find-package ,(package-name *package*))
                                 :test-lambda
-                                (lambda ()
+                                (named-lambda ,lambda-name ()
                                   ,@ (ecase compile-at
                                        (:run-time `((funcall
                                                      (let ((*package* (find-package ',(package-name *package*))))
-                                                       (compile nil '(lambda ()
-                                                                      ,@effective-body))))))
+                                                       (compile ',inner-lambda-name
+                                                                '(lambda () ,@effective-body))))))
                                        (:definition-time effective-body)))
                                 :description ,description
                                 :depends-on ',depends-on