Resolve issue scgilardi#20, properly implement test for selector form

revelytix · Feb 25, 2012 · 3647564 · 3647564
1 parent a2f4df5
commit 3647564
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/slingshot/support.clj b/src/slingshot/support.clj
@@ -8,6 +8,17 @@
   [smap coll]
   (clojure.walk/postwalk-replace smap coll))
 
+(defn appears-within?
+  "Returns true if x appears within coll at any nesting depth"
+  [x coll]
+  (let [result (atom false)]
+    (clojure.walk/postwalk
+     (fn [t]
+       (when (= x t)
+         (reset! result true)))
+     coll)
+    @result))
+
 (defn throw-arg
   "Throws an IllegalArgumentException with a message given arguments
   for clojure.core/format"
@@ -155,7 +166,8 @@
                        (throw-arg "key-value selector: %s does not match: %s"
                                   (pr-str selector) "[key val]"))))
               (selector-form []
-                (and (seq? selector) selector))
+                (and (seq? selector) (appears-within? '% selector)
+                     selector))
               (predicate []
                 `(~selector ~'%))]
            (->> (or (class-name) (key-value) (selector-form) (predicate))

diff --git a/test/slingshot/test/slingshot.clj b/test/slingshot/test/slingshot.clj
@@ -316,3 +316,11 @@
                    &throw-context))]
     (is (= "wrapper-0" (.getMessage ^Throwable (:wrapper context))))
     (is (= "wrapper-1" (.getMessage ^Throwable (:throwable context))))))
+
+(deftest test-inline-predicate
+  (is (= :not-caught (try+
+                      (throw+ {:foo true})
+                      (catch #(-> % :foo (= false)) data
+                        :caught)
+                      (catch Object _
+                        :not-caught)))))