implement check

Author: swannodette

src/main/cljs/cljs/spec/test.cljc

@@ -181,6 +181,11 @@ Returns a collection of syms naming the vars unstrumented."
       (validate-check-opts opts#)
       (check-1 nil ~f ~spec opts#))))
 
+(defn checkable-syms* [opts]
+  (reduce into #{}
+    [(filter fn-spec-name? (keys @s/registry-ref))
+     (keys (:spec opts))]))
+
 (defmacro checkable-syms
   "Given an opts map as per check, returns the set of syms that
 can be checked."
@@ -191,4 +196,51 @@ can be checked."
       (validate-check-opts opts#)
       (reduce conj #{}
         '[~@(filter fn-spec-name? (keys @s/registry-ref))
-          ~@(keys (:spec opts))]))))
+          ~@(keys (:spec opts))]))))
+
+(defmacro check
+  "Run generative tests for spec conformance on vars named by
+sym-or-syms, a symbol or collection of symbols. If sym-or-syms
+is not specified, check all checkable vars.
+
+The opts map includes the following optional keys, where stc
+aliases clojure.spec.test.check:
+
+::stc/opts  opts to flow through test.check/quick-check
+:gen        map from spec names to generator overrides
+
+The ::stc/opts include :num-tests in addition to the keys
+documented by test.check. Generator overrides are passed to
+spec/gen when generating function args.
+
+Returns a lazy sequence of check result maps with the following
+keys
+
+:spec       the spec tested
+:sym        optional symbol naming the var tested
+:failure    optional test failure
+::stc/ret   optional value returned by test.check/quick-check
+
+The value for :failure can be any exception. Exceptions thrown by
+spec itself will have an ::s/failure value in ex-data:
+
+:check-failed   at least one checked return did not conform
+:no-args-spec   no :args spec provided
+:no-fn          no fn provided
+:no-fspec       no fspec provided
+:no-gen         unable to generate :args
+:instrument     invalid args detected by instrument
+"
+  ([]
+   `(check '~(checkable-syms*)))
+  ([sym-or-syms]
+   `(check ~sym-or-syms nil))
+  ([sym-or-syms opts]
+   (let [sym-or-syms (eval sym-or-syms)
+         opts-sym    (gensym "opts")]
+     `(let [~opts-sym ~opts]
+        [~@(->> (collectionize sym-or-syms)
+             (filter (checkable-syms* opts))
+             (map
+               (fn [sym]
+                 (do `(check-1 '~sym nil nil ~opts-sym)))))]))))

src/main/cljs/cljs/spec/test.cljs

@@ -226,47 +226,6 @@ with explain-data + ::s/failure."
   [opts]
   (assert (every? ident? (keys (:gen opts))) "check :gen expects ident keys"))
 
-(defn check
-  "Run generative tests for spec conformance on vars named by
-sym-or-syms, a symbol or collection of symbols. If sym-or-syms
-is not specified, check all checkable vars.
-
-The opts map includes the following optional keys, where stc
-aliases clojure.spec.test.check:
-
-::stc/opts  opts to flow through test.check/quick-check
-:gen        map from spec names to generator overrides
-
-The ::stc/opts include :num-tests in addition to the keys
-documented by test.check. Generator overrides are passed to
-spec/gen when generating function args.
-
-Returns a lazy sequence of check result maps with the following
-keys
-
-:spec       the spec tested
-:sym        optional symbol naming the var tested
-:failure    optional test failure
-::stc/ret   optional value returned by test.check/quick-check
-
-The value for :failure can be any exception. Exceptions thrown by
-spec itself will have an ::s/failure value in ex-data:
-
-:check-failed   at least one checked return did not conform
-:no-args-spec   no :args spec provided
-:no-fn          no fn provided
-:no-fspec       no fspec provided
-:no-gen         unable to generate :args
-:instrument     invalid args detected by instrument
-"
-  ([] (check (checkable-syms)))
-  ([sym-or-syms] (check sym-or-syms nil))
-  ([sym-or-syms opts]
-   (->> (collectionize sym-or-syms)
-     (filter (checkable-syms opts))
-     (map
-       #(check-1 (sym->check-map %) opts)))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; check reporting  ;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defn- failure-type
@@ -387,6 +346,8 @@ key with a count for each different :type of result."
       :ret  int?))
 
   (m/checkable-syms)
+
+  (m/check `ranged-rand)
   )