[Issue #82] fixing shrinking to happen at runtime not macroexpand time

marick · Mar 11, 2012 · b835d32 · b835d32
2 parents 2a6db5c + 08e57ec
commit b835d32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/midje/ideas/formulas.clj b/src/midje/ideas/formulas.clj
@@ -20,7 +20,7 @@
 (defn shrink [& _args] [])
 
 (defmacro shrink-failure-case [docstring binding-name failed-binding-val body]
-  `(loop [[cur-shrunk# & rest#] ~(midje.ideas.formulas/shrink failed-binding-val)] ;; (shrink (eval failed-binding-val)) ???
+  `(loop [[cur-shrunk# & rest#] (midje.ideas.formulas/shrink ~failed-binding-val)]
      (when cur-shrunk#
        (when (let [~binding-name cur-shrunk#]
                (midje.sweet/fact ~docstring   ;; duplicated
@@ -50,10 +50,11 @@
       `(try
          (loop [cnt-down# midje.ideas.formulas/*num-generations-per-formula*]
            (when (pos? cnt-down#)
-             (let [~(first bindings) ~(second bindings)]
+             (let [ snd-binding# ~(second bindings)
+                    ~(first bindings) snd-binding#]
                (if ~fact
                  (recur (dec cnt-down#))
-                 (shrink-failure-case ~docstring? ~(first bindings) ~(second bindings) ~body)))))
+                 (shrink-failure-case ~docstring? ~(first bindings) snd-binding# ~body)))))
          (finally
            ~conclusion-signal)))))
 

diff --git a/test/midje/ideas/t_formulas.clj b/test/midje/ideas/t_formulas.clj
@@ -91,8 +91,8 @@
 (after-silently 
   (formula [z (z-maker)]
     (my-identity z) => "clearly not 'z'"))
-(fact @z-maker-count => 1)
-(fact @my-identity-count => 1)
+(fact "calls generator once" @z-maker-count => 1)
+(fact "evalautes body once" @my-identity-count => 1)
 
 ;; shrinks failure case to smallest possible failure
 (with-redefs [midje.ideas.formulas/shrink (constantly [0 1 2 3 4 5])] ;; I don't think wtih-redefs is working right, hence the failures I'm seeing