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

diff --git a/src/fixture.lisp b/src/fixture.lisp
index 325933c..26e9933 100644
--- a/src/fixture.lisp
+++ b/src/fixture.lisp
@@ -1,23 +1,33 @@
 ;; -*- 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.")
 
-(defmacro def-fixture (name args &body body)
+(defun get-fixture (key &optional default)
+  (gethash key *fixture* default))
+
+(defun (setf get-fixture) (value key)
+  (setf (gethash key *fixture*) value))
+
+(defun rem-fixture (key)
+  (remhash key *fixture*))
+
+(defmacro def-fixture (name (&rest 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
 with DEF-FIXTURE is a macro which can use the special macrolet
@@ -29,24 +39,28 @@ See Also: WITH-FIXTURE
      (setf (get-fixture ',name) (cons ',args ',body))
      ',name))
 
-(defmacro with-fixture (fixture-name args &body body)
+(defmacro with-fixture (fixture-name (&rest args) &body body)
   "Insert BODY into the fixture named FIXTURE-NAME.
 
 See Also: DEF-FIXTURE"
-  (destructuring-bind (largs &rest lbody) (get-fixture fixture-name)
+  (assert (get-fixture fixture-name)
+          (fixture-name)
+          "Unknown fixture ~S." fixture-name)
+  (destructuring-bind ((&rest largs) &rest lbody)
+      (get-fixture fixture-name)
     `(macrolet ((&body () '(progn ,@body)))
-       (funcall (lambda ,largs ,@lbody) ,@args))))
+       (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 +68,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