X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ffixture.lisp;h=2f559ec35736ad306de5d720ddde4a67d7661cca;hb=4779162765c555cbd48f8d0febacab26ae649718;hp=325933c0b9864a64916de9a3ae3f3bce6ada9f20;hpb=1454981ac5f4f7ea8fe741a8125efbf0b09497ea;p=fiveam.git

diff --git a/src/fixture.lisp b/src/fixture.lisp
index 325933c..2f559ec 100644
--- a/src/fixture.lisp
+++ b/src/fixture.lisp
@@ -1,22 +1,37 @@
 ;; -*- lisp -*-
 
-(in-package :it.bese.FiveAM)
+(in-package :it.bese.fiveam)
 
 ;;;; ** Fixtures
 
 ;;;; When running tests we often need to setup some kind of context
 ;;;; (create dummy db connections, simulate an http request,
 ;;;; etc.). Fixtures provide a way to conviently hide this context
-;;;; into a macro and allow the test to fuces on testing.
+;;;; into a macro and allow the test to focus on testing.
 
 ;;;; NB: A FiveAM fixture is nothing more than a macro. Since the term
 ;;;; 'fixture' is so common in testing frameworks we've provided a
 ;;;; wrapper around defmacro for this purpose.
 
-(deflookup-table fixture
-  :documentation "Lookup table mapping fixture names to fixture
+(defvar *fixture*
+  (make-hash-table :test 'eql)
+  "Lookup table mapping fixture names to fixture
   objects.")
 
+(defun get-fixture (key &optional default)
+  (gethash key *fixture* default))
+
+(defun (setf get-fixture) (value key)
+  (when (gethash key *fixture*)
+    (warn "Redefining ~A in deflookup-table named ~S"
+          (let ((*package* (find-package :keyword)))
+            (format nil "~S" key))
+          'fixture))
+  (setf (gethash key *fixture*) value))
+
+(defun rem-fixture (key)
+  (remhash key *fixture*))
+
 (defmacro def-fixture (name args &body body)
   "Defines a fixture named NAME. A fixture is very much like a
 macro but is used only for simple templating. A fixture created
@@ -33,20 +48,23 @@ See Also: WITH-FIXTURE
   "Insert BODY into the fixture named FIXTURE-NAME.
 
 See Also: DEF-FIXTURE"
+  (assert (get-fixture fixture-name)
+          (fixture-name)
+          "Unknown fixture ~S." fixture-name)
   (destructuring-bind (largs &rest lbody) (get-fixture fixture-name)
     `(macrolet ((&body () '(progn ,@body)))
        (funcall (lambda ,largs ,@lbody) ,@args))))
 
 ;; 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.
@@ -54,7 +72,7 @@ See Also: DEF-FIXTURE"
 ;;  - 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