From 4da966f6a1d10a2ceafa5b86d3aec0bc3bf21b00 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 5 Feb 2023 19:56:24 -0600 Subject: [PATCH] Attempt an initial migration to test.generative 1.0.0 --- project.clj | 2 +- test/cheshire/test/generative.clj | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/project.clj b/project.clj index 4ffb3175..ce21ca85 100644 --- a/project.clj +++ b/project.clj @@ -12,7 +12,7 @@ :exclusions [com.fasterxml.jackson.core/jackson-databind]] [tigris "0.1.2"]] :profiles {:dev {:dependencies [[org.clojure/clojure "1.11.1"] - [org.clojure/test.generative "0.1.4"] + [org.clojure/test.generative "1.0.0"] [org.clojure/tools.namespace "0.3.1"]]} :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]} :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]} diff --git a/test/cheshire/test/generative.clj b/test/cheshire/test/generative.clj index 6b6cd7d4..21636fa2 100644 --- a/test/cheshire/test/generative.clj +++ b/test/cheshire/test/generative.clj @@ -1,10 +1,10 @@ (ns cheshire.test.generative - (:use [cheshire.core] - [clojure.test.generative] - [clojure.test :only [deftest is]])) - -;; determines whether generative stuff is printed to stdout -(def verbose true) + (:require + [cheshire.core :refer [decode encode]] + [clojure.data.generators] + [clojure.test :refer [deftest is]] + [clojure.test.generative :refer [defspec]] + [clojure.test.generative.runner :as runner])) (defn encode-equality [x] [x (decode (encode x))]) @@ -43,13 +43,8 @@ (is (= (first %) (last %)))) (deftest ^{:generative true} t-generative - ;; I want the seeds to change every time, set the number higher if - ;; you have more than 16 CPU cores - (let [seeds (take 16 (repeatedly #(rand-int 1024)))] - (when-not verbose - (reset! report-fn identity)) - (println "Seeds:" seeds) - (binding [*msec* 25000 - *seeds* seeds - *verbose* false] - (doall (map deref (test-namespaces 'cheshire.test.generative)))))) + (runner/run-suite {:nthreads (-> (Runtime/getRuntime) .availableProcessors) + :msec 25000 + :progress (constantly true)} + (->> 'cheshire.test.generative ns-interns vals + (mapcat runner/get-tests))))