minor enhancements:

  - specs return result, not validation result
  - report framework summaries separately
  - events always go somewhere

Author: stuarthalloway

src/main/clojure/clojure/test/generative.clj

@@ -55,6 +55,8 @@
         (meta &form))))
 
 (defmacro is
+  "Assert that v is true, otherwise fail the current generative
+   test (with optional msg)."
   ([v] (with-meta `(is ~v nil) (meta &form)))
   ([v msg]
      `(let [~'actual ~v ~'expected '~v]
@@ -67,6 +69,28 @@
              (meta &form))))))
 
 (defmacro defspec
+  "Defines a function named name that expects args. The defined
+   function binds '%' to the result of calling fn-to-test with args,
+   and runs validator-body forms (if any), which have access to both
+   args and %. The defined function.
+
+   Args must have type hints (i.e. :tag metdata), which are
+   interpreted as instructions for generating test input
+   data. Unquoted names in type hints are resolved in the
+   c.t.g.generators namespace, which has generator functions for
+   common Clojure data types. For example, the following argument list
+   declares that 'seed' is an int, and that 'iters' is an int in the
+   uniform distribution from 1 to 100:
+
+       [^int seed ^{:tag (uniform 1 100)} iters]
+
+   Backquoted names in an argument list are resolved in the current
+   namespace, allowing arbitrary generators, e.g.
+
+       [^{:tag `scary-word} word]
+
+   The function c.t.g.runner/run-iter takes a var naming a test, and runs
+   a single test iteration, generating inputs based on the arg type hints."
   [name fn-to-test args & validator-body]
   (when-let [missing-tags (->> (map #(list % (-> % meta :tag)) args)
                                (filter (fn [[_ tag]] (nil? tag)))
@@ -76,7 +100,8 @@
                             ::inputs (into [] (map #(-> % meta :tag tag->gen eval)  args))))
      ~(into [] (map (fn [a#] (with-meta a# (dissoc (meta a#) :tag))) args))
      (let [~'% (apply ~fn-to-test ~args)]
-       ~@validator-body)))
+       ~@validator-body
+       ~'%)))
 
 
 

src/main/clojure/clojure/test/generative/event.clj

@@ -8,7 +8,8 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns clojure.test.generative.event
-  (:require [clojure.test.generative.config :as config]))
+  (:require [clojure.test.generative.config :as config]
+            [clojure.test.generative.io :as io]))
 
 (set! *warn-on-reflection* true)
 
@@ -107,10 +108,13 @@
     (add-handler (load-var-val (symbol handler)))))
 
 (defn report-fn
-  "Call the installed handles for an event"
+  "Call the installed handlers for an event, or io/pprint if no handlers
+   installed."
   [event]
-  (doseq [f @handlers]
-    (f event)))
+  (if-let [hs (seq @handlers)]
+    (doseq [h hs]
+      (h event))
+    (io/pprint event)))
 
 (defmacro report
   [type & args]

src/main/clojure/clojure/test/generative/runner.clj

@@ -158,18 +158,23 @@
 (defn run-all-tests
   "Run generative tests and clojure.test tests"
   [nses threads msec]
-  (let [event-counts (atom {})
-        event-counter #(when-not (contains? (:tags %) :begin)
-                         (when-let [type (:type %)]
-                           (swap! event-counts update-in [type] (fnil inc 0))))]
-    (event/with-handler event-counter
-      (event/report :test/library :name 'clojure.test)
-      (binding [ctest/report cta/report-adapter]
-        (apply ctest/run-tests (filter has-clojure-test-tests? nses)))
-      (event/report :test/library :name 'clojure.test.generative)
-      (run-generative-tests nses threads msec)
-      (io/await)
-      @event-counts)))
+  (let [run-with-counts
+        (fn [lib f]
+          (let [event-counts (atom {})
+                event-counter #(when-not (contains? (:tags %) :begin)
+                                 (when-let [type (:type %)]
+                                   (swap! event-counts update-in [type] (fnil inc 0))))]
+            (event/report :test/library :name lib)
+            (event/with-handler event-counter (f))
+            @event-counts))
+        ct-results (run-with-counts 'clojure.test
+                     #(binding [ctest/report cta/report-adapter]
+                        (apply ctest/run-tests (filter has-clojure-test-tests? nses))))
+        ctg-results (run-with-counts 'clojure.test.generative
+                      #(run-generative-tests nses threads msec))]
+    (io/await)
+    {'clojure.test ct-results
+     'clojure.test.generative ctg-results}))
 
 (defn failed?
   [result]
@@ -187,9 +192,11 @@
       (doseq [ns nses] (require ns))
       (event/install-default-handlers)
       (try
-       (let [result (run-all-tests nses (:threads conf) (:msec conf))]
-         (println "\n" result)
-         (System/exit (if (failed? result) 1 0)))
+       (let [results (run-all-tests nses (:threads conf) (:msec conf))]
+         (doseq [[k v] results]
+           (println (str "\nFramework " k))
+           (println v))
+         (System/exit (if (some failed? (vals results)) 1 0)))
        (catch Throwable t
          (.printStackTrace t)
          (System/exit -1))