port check-fn

Author: swannodette

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

@@ -143,12 +143,12 @@ Returns a collection of syms naming the vars unstrumented."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; testing  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defmacro check-1
-  [[quote s] f opts]
-  (let [{:keys [name] :as v} (ana-api/resolve &env s)]
+  [[quote s :as qs] f spec opts]
+  (let [{:keys [name] :as v} (when qs (ana-api/resolve &env s))]
     `(let [s#        '~name
            opts#     ~opts
            v#        ~(when v `(var ~name))
-           spec#     ~(when v `(s/get-spec (var ~name)))
+           spec#     (or ~spec ~(when v `(s/get-spec (var ~name))))
            re-inst?# (and v# (seq (unstrument '~name)) true)
            f#        (or ~f (when v# @v#))]
        (try
@@ -165,4 +165,14 @@ Returns a collection of syms naming the vars unstrumented."
            {:failure (ex-info "No :args spec" {::s/failure :no-args-spec})
             :sym     s# :spec spec#})
          (finally
-           (when re-inst?# (instrument '~name)))))))
+           (when re-inst?# (instrument '~name)))))))
+
+(defmacro check-fn
+  "Runs generative tests for fn f using spec and opts. See
+'check' for options and return."
+  ([f spec]
+   `(check-fn ~f ~spec nil))
+  ([f spec opts]
+   `(let [opts# ~opts]
+      (validate-check-opts opts#)
+      (check-1 nil ~f ~spec opts#))))

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

@@ -226,14 +226,6 @@ with explain-data + ::s/failure."
   [opts]
   (assert (every? ident? (keys (:gen opts))) "check :gen expects ident keys"))
 
-(defn check-fn
-  "Runs generative tests for fn f using spec and opts. See
-'check' for options and return."
-  ([f spec] (check-fn f spec nil))
-  ([f spec opts]
-   (validate-check-opts opts)
-   (check-1 {:f f :spec spec} opts)))
-
 (defn checkable-syms
   "Given an opts map as per check, returns the set of syms that
 can be checked."
@@ -370,10 +362,10 @@ key with a count for each different :type of result."
 
   (s/fdef ranged-rand
     :args (s/and (s/cat :start int? :end int?)
-            #(< (:start %) (:end %)))
-    :ret int?
-    :fn (s/and #(>= (:ret %) (-> % :args :start))
-          #(< (:ret %) (-> % :args :end))))
+                 #(< (:start %) (:end %)))
+    :ret  int?
+    :fn   (s/and #(>= (:ret %) (-> % :args :start))
+                 #(< (:ret %) (-> % :args :end))))
 
   (instrumentable-syms)
 
@@ -396,7 +388,12 @@ key with a count for each different :type of result."
   (foo 1 2)
   (m/unstrument-1 `ranged-rand)
 
-  (m/check-1 `ranged-rand nil {})
+  (m/check-1 `ranged-rand nil nil {})
+
+  (m/check-fn inc
+    (s/fspec
+      :args (s/cat :x int?)
+      :ret  int?))
   )