X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ftest.lisp;h=2712d6a5ba439361d1e955dd753c09582fd43882;hb=18e49d01c2cd5c254862946e8b5b77844107f867;hp=7de4941724bdb3b8747868836e02cf9ee59c8eaa;hpb=47e54369152b69e10aa6b6e60ad9ccb68deb00b0;p=fiveam.git

diff --git a/src/test.lisp b/src/test.lisp
index 7de4941..2712d6a 100644
--- a/src/test.lisp
+++ b/src/test.lisp
@@ -1,21 +1,30 @@
-;; -*- lisp -*-
+;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
 
-(in-package :it.bese.FiveAM)
+(in-package :it.bese.fiveam)
 
 ;;;; * Tests
 
 ;;;; While executing checks and collecting the results is the core job
 ;;;; of a testing framework it is also important to be able to
-;;;; organize checks into groups, FiveAM provides two mechanisms for
+;;;; organize checks into groups, fiveam provides two mechanisms for
 ;;;; organizing checks: tests and test suites. A test is a named
 ;;;; 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,24 +74,27 @@ 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
-                                                  #-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 (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)
            (when *run-test-when-defined*
              (run! ',name))
@@ -92,15 +104,15 @@ If PROFILE is T profiling information will be collected as well."
   "When non-NIL tests are run as soon as they are defined.")
 
 ;; Copyright (c) 2002-2003, Edward Marco Baringer
-;; All rights reserved. 
-;; 
+;; All rights reserved.
+;;
 ;; Redistribution and use in source and binary forms, with or without
 ;; modification, are permitted provided that the following conditions are
 ;; met:
-;; 
+;;
 ;;  - Redistributions of source code must retain the above copyright
 ;;    notice, this list of conditions and the following disclaimer.
-;; 
+;;
 ;;  - Redistributions in binary form must reproduce the above copyright
 ;;    notice, this list of conditions and the following disclaimer in the
 ;;    documentation and/or other materials provided with the distribution.
@@ -108,7 +120,7 @@ If PROFILE is T profiling information will be collected as well."
 ;;  - Neither the name of Edward Marco Baringer, nor BESE, nor the names
 ;;    of its contributors may be used to endorse or promote products
 ;;    derived from this software without specific prior written permission.
-;; 
+;;
 ;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 ;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR