@@ -825,9 +825,13 @@ Chas Emerick, Allen Rohner, and Stuart Halloway", "Adds elements in coll to the current namespace metadata as the value of key." [key coll] - (alter-meta! *ns* assoc key (concat (key (meta *ns*)) coll))) + (alter-meta! *ns* assoc key coll)) -(defmulti use-fixtures (fn [fixture-type & args] fixture-type)) +(defmulti use-fixtures + "Wrap test runs in a fixture function to perform setup and + teardown. Using a fixture-type of :each wraps every test + individually, while:once wraps the whole run in a single function." + (fn [fixture-type & args] fixture-type)) (defmethod use-fixtures :each [fixture-type & args] (add-ns-meta ::each-fixtures args)) src/clj/clojure/test.clj @@ -16,6 +16,8 @@ (declare *a* *b* *c* *d*) +(def *n* 0) + (defn fixture-a [f] (binding [*a* 3] (f))) @@ -28,9 +30,13 @@ (defn fixture-d [f] (binding [*d* 11] (f))) +(defn inc-n-fixture [f] + (binding [*n* (inc *n*)] (f))) + (use-fixtures :once fixture-a fixture-b) -(use-fixtures :each fixture-c fixture-d) +(use-fixtures :each fixture-c fixture-d inc-n-fixture) +(use-fixtures :each fixture-c fixture-d inc-n-fixture) (deftest can-use-once-fixtures (is (= 3 *a*)) @@ -39,3 +45,6 @@ (deftest can-use-each-fixtures (is (= 7 *c*)) (is (= 11 *d*))) + +(deftest use-fixtures-replaces + (is (= *n* 1))) \ No newline at end of file test/clojure/test_clojure/test_fixtures.clj 6aab0f20e6bcc897b86a77b728af6fa0df93a2d8 Phil Hagelberg technomancy@gmail.com http://github.com/digash/clojure/commit/f5f2943dfd0128744227c3f42a630ea10dd40b24 f5f2943dfd0128744227c3f42a630ea10dd40b24 2009-10-28T19:33:46-07:00 2009-10-07T10:54:52-07:00 Don't repeatedly compose on calls to use-fixtures. Fixes #194. Updated tests and added a docstring to use-fixtures. Signed-off-by: Chouser <chouser@n01se.net> 02aa06ac10224c9ce16b94c87bf5264313106163 Chouser chouser@n01se.net