From eb7021af8260c17e29d2653a3de982fb48e1e6c8 Mon Sep 17 00:00:00 2001 From: Rich Hickey Date: Sat, 1 May 2010 15:03:18 -0400 Subject: removed seq-contains? calls --- src/test/clojure/clojure/contrib/test_jmx.clj | 3 ++- src/test/clojure/clojure/contrib/test_repl_utils.clj | 10 +++++----- src/test/clojure/clojure/contrib/test_with_ns.clj | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/clojure/clojure/contrib/test_jmx.clj b/src/test/clojure/clojure/contrib/test_jmx.clj index ef7037b0..dcfc9321 100644 --- a/src/test/clojure/clojure/contrib/test_jmx.clj +++ b/src/test/clojure/clojure/contrib/test_jmx.clj @@ -26,7 +26,8 @@ "Does container contain every item in containee? Not fast. Testing use only" [container containee] - (every? #(seq-contains? container %) containee)) + (let [container (set container)] + (every? #(contains? container %) containee))) (deftest finding-mbeans (testing "as-object-name" diff --git a/src/test/clojure/clojure/contrib/test_repl_utils.clj b/src/test/clojure/clojure/contrib/test_repl_utils.clj index 77ae2aae..6fa12ed7 100644 --- a/src/test/clojure/clojure/contrib/test_repl_utils.clj +++ b/src/test/clojure/clojure/contrib/test_repl_utils.clj @@ -5,16 +5,16 @@ (deftest test-apropos (testing "with a regular expression" (is (= '[defmacro] (apropos #"^defmacro$"))) - (is (seq-contains? (apropos #"def.acr.") 'defmacro)) + (is (some '#{defmacro} (apropos #"def.acr."))) (is (= [] (apropos #"nothing-has-this-name")))) (testing "with a string" - (is (seq-contains? (apropos "defmacro") 'defmacro)) - (is (seq-contains? (apropos "efmac") 'defmacro)) + (is (some '#{defmacro} (apropos "defmacro"))) + (is (some '#{defmacro} (apropos "efmac"))) (is (= [] (apropos "nothing-has-this-name")))) (testing "with a symbol" - (is (seq-contains? (apropos 'defmacro) 'defmacro)) - (is (seq-contains? (apropos 'efmac) 'defmacro)) + (is (some '#{defmacro} (apropos 'defmacro))) + (is (some '#{defmacro} (apropos 'efmac))) (is (= [] (apropos 'nothing-has-this-name))))) diff --git a/src/test/clojure/clojure/contrib/test_with_ns.clj b/src/test/clojure/clojure/contrib/test_with_ns.clj index 5ba62c0e..8d3ca3c1 100644 --- a/src/test/clojure/clojure/contrib/test_with_ns.clj +++ b/src/test/clojure/clojure/contrib/test_with_ns.clj @@ -6,7 +6,7 @@ (let [all-ns-names (fn [] (map #(.name %) (all-ns)))] (testing "unexceptional return" (let [ns-name (with-temp-ns (ns-name *ns*))] - (is (not (seq-contains? (all-ns-names) ns-name))))) + (is (not (some #{ns-name} (all-ns-names)))))) (testing "when an exception is thrown" (let [ns-name-str (try @@ -15,4 +15,4 @@ (catch clojure.lang.Compiler$CompilerException e (-> e .getCause .getMessage)))] (is (re-find #"^sym.*$" ns-name-str)) - (is (not (seq-contains? (all-ns-names) (symbol ns-name-str)))))))) + (is (not (some #{(symbol ns-name-str)} (all-ns-names)))))))) -- cgit v1.2.3-18-g5258