use clojure.data.generators

Author: stuarthalloway

pom.xml

@@ -56,6 +56,11 @@
       <artifactId>tools.namespace</artifactId>
       <version>0.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>data.generators</artifactId>
+      <version>0.1.0</version>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>

src/examples/clojure/clojure/test/array_test.clj

@@ -9,7 +9,7 @@
 
 (ns clojure.test.array-test
   (:use clojure.test.generative)
-  (:require [clojure.test.generative.generators :as gen]))
+  (:require [clojure.data.generators :as gen]))
 
 (defn nan-or-=
   [a b]

src/examples/clojure/clojure/test/core_test.clj

@@ -9,7 +9,7 @@
 
 (ns clojure.test.core-test
   (:use clojure.test.generative clojure.pprint clojure.data clojure.walk)
-  (:require [clojure.test.generative.generators :as gen]))
+  (:require [clojure.data.generators :as gen]))
 
 (def ^:private failed-diff-ref (atom nil))
 

src/examples/clojure/clojure/test/hash_test.clj

@@ -9,7 +9,7 @@
 
 (ns clojure.test.hash-test
   (:use clojure.test.generative)
-  (:require [clojure.test.generative.generators :as gen]))
+  (:require [clojure.data.generators :as gen]))
 
 (defn hash-obj
   [h]

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

@@ -9,7 +9,7 @@
 
 (ns clojure.test.math-test
   (:use clojure.test.generative)
-  (:require [clojure.test.generative.generators :as gen]))
+  (:require [clojure.data.generators :as gen]))
 
 (defn integer
   "Distribution of integers biased towards the small, but

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

@@ -14,14 +14,14 @@
 
 (defn- fully-qualified
   "Qualify a name used in :tag metadata. Unqualified names are
-   interpreted in the 'clojure.test.generative.generators, except
+   interpreted in the 'clojure.data.generators, except
    for the fn-building symbols fn and fn*."
   [n]
   (let [ns (cond
             (#{'fn*} n) nil
             (#{'fn} n) 'clojure.core
             (namespace n) (namespace n)
-            :else 'clojure.test.generative.generators)]
+            :else 'clojure.data.generators)]
     (if ns
       (symbol (str ns) (name n))
       n)))

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

@@ -14,7 +14,7 @@
    [clojure.tools.namespace :as ns]
    [clojure.test.generative.config :as config]
    [clojure.test.generative.event :as event]
-   [clojure.test.generative.generators :as gen]
+   [clojure.data.generators :as gen]
    [clojure.test.generative.io :as io]
    [clojure.test :as ctest]))
 
@@ -146,7 +146,7 @@
                                               :name name)))
                             (event/report :test/test
                                           :msec (- now start)
-                                          :count (inc iter)
+                                          :count iter
                                           :tags #{:end :test/inputs-exhausted}
                                           :test/result (if failed? :test/fail :test/pass)
                                           :level (if failed? :warn :info)

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

@@ -1,7 +1,7 @@
 (ns clojure.test.generative.generators-test
   (:use clojure.test.generative
         [clojure.test :only (deftest) :as ct])
-  (:require [clojure.test.generative.generators :as gen]))
+  (:require [clojure.data.generators :as gen]))
 
 (defspec test-repeatable-generation
   (constantly nil)