X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Ffixture.lisp;h=3805e91b8add25bdbaebe76706c3b38f20b47d7a;hb=1536b825609bcec416a399b737ed9e4a56292d8f;hp=32ca2dde04fe1f17b65063e9c1c17c151f0dcf86;hpb=3318adf2a6ee1a055fff9db1ab2ba9e59fa90792;p=fiveam.git

diff --git a/src/fixture.lisp b/src/fixture.lisp
index 32ca2dd..3805e91 100644
--- a/src/fixture.lisp
+++ b/src/fixture.lisp
@@ -1,55 +1,67 @@
 ;; -*- 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)
-  "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
-&BODY to specify where the body should go.
+(defun get-fixture (key &optional default)
+  (gethash key *fixture* default))
 
-See Also: WITH-FIXTURE
-"
+(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. At \"evaluation time\" (not macro
+expansion time) `BODY` will be run, however `BODY` can call the local
+macro `&body` which will expand to the body passed to the
+`with-fixture` call.
+
+See Also: `WITH-FIXTURE`"
   `(eval-when (:compile-toplevel :load-toplevel :execute)
      (setf (get-fixture ',name) (cons ',args ',body))
      ',name))
 
-(defmacro with-fixture (fixture-name args &body body)
-  "Insert BODY into the fixture named FIXTURE-NAME.
+(defmacro with-fixture (fixture-name (&rest args) &body body)
+  "Lookup a fixture named `NAME` (at macro expansion time),
+replace the fixture's `&body` with `BODY` and compile the resulting
+form.
 
-See Also: DEF-FIXTURE"
+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)
+  (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.
@@ -57,7 +69,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