expose data level

Author: stuarthalloway

README.md

@@ -39,7 +39,19 @@ and a validator:
 To generate test data, see the fns in the generators namespace. Note
 that these functions shadow a bunch of clojure.core names.
 
-Running Interactively During Development
+You can also create the underlying test data structures directly,
+marking vars with :clojure.test.generative/specs so they are picked up
+by the runner.  This can be useful e.g. to model relationships between
+input parameters, or to specify a finite list of special cases. The
+example below specifies five specific one-argument arg lists:
+
+    (def ^::tgen/specs
+      inc'-doesnt-overflow-specs
+      [{:test 'clojure.test.math-test/inc'-doesnt-overflow
+        :input-gen #(map vector [Long/MIN_VALUE -1 0 1 Long/MAX_VALUE])}])
+
+
+Running Interactively During Development 
 ========================================
 
 Specify the number of threads, the number of msec, and one or more

src/examples/clojure/clojure/test/math_test.clj

@@ -9,7 +9,9 @@
 
 (ns clojure.test.math-test
   (:use clojure.test.generative)
-  (:require [clojure.data.generators :as gen]))
+  (:require
+   [clojure.data.generators :as gen]
+   [clojure.test.generative :as tgen]))
 
 (defn integer
   "Distribution of integers biased towards the small, but
@@ -85,3 +87,14 @@
       (assert (= a
                  (+ (* q d) r)
                  (unchecked-add (unchecked-multiply q d) r))))))
+
+(defn inc'-doesnt-overflow
+  [a]
+  (assert (< a (inc' a))))
+
+;; You can mark a var containing "raw" specs with ::tgen/specs to
+;; include it in the test suite.
+(def ^::tgen/specs
+  inc'-doesnt-overflow-specs
+  [{:test 'clojure.test.math-test/inc'-doesnt-overflow
+    :input-gen #(map vector [Long/MIN_VALUE -1 0 1 Long/MAX_VALUE])}])

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

@@ -11,7 +11,8 @@
   (:require
    [clojure.pprint :as pprint]
    [clojure.tools.namespace :as ns]
-   [clojure.data.generators :as gen]))
+   [clojure.data.generators :as gen]
+   [clojure.test.generative :as tgen]))
 
 (set! *warn-on-reflection* true)
 
@@ -50,19 +51,22 @@
   clojure.lang.Var 
   (get-tests
    [v]
-   (when-let [arg-fns (:clojure.test.generative/arg-fns (meta v))]
-     [{:test (-> (if-let [ns (.ns v)]
-                   (str ns "/" (.sym v))
-                   (.sym v))
-                 symbol)
-       :input-gen (fn []
-                    (repeatedly
-                     (fn []
-                       (into [] (map #(%) arg-fns)))))}]))
-
-  clojure.lang.MapEquivalence
-  (get-tests
-   [m] m))
+   (let [m (meta v)
+         arg-fns (::tgen/arg-fns m)
+         specs (::tgen/specs m)]
+     (cond
+      arg-fns
+      [{:test (-> (if-let [ns (.ns v)]
+                    (str ns "/" (.sym v))
+                    (.sym v))
+                  symbol)
+        :input-gen (fn []
+                     (repeatedly
+                      (fn []
+                        (into [] (map #(%) arg-fns)))))}]
+
+      specs
+      @v))))
 
 
 (defn- find-vars-in-namespaces