From 868a53b077eebb76bbe002ab4a806e4edb9b8de6 Mon Sep 17 00:00:00 2001
From: jem <michael.jerger@meissa-gmbh.de>
Date: Wed, 29 May 2019 18:55:46 +0200
Subject: [PATCH] introduce datatest reporters

---
 main/src/data_test.clj          |  5 ++--
 main/src/data_test/reporter.clj | 53 ++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/main/src/data_test.clj b/main/src/data_test.clj
index c0864a6..0b42d6c 100644
--- a/main/src/data_test.clj
+++ b/main/src/data_test.clj
@@ -33,10 +33,9 @@
                                         data-spec-file# (:data-spec-file data-spec#)
                                         message# (new java.io.StringWriter)]
                                     (binding [t/*testing-contexts*
-                                              (conj ct/*testing-contexts* data-spec-file#)
-                                              t/*test-out* message#]
+                                              (conj t/*testing-contexts* data-spec-file#)
+                                              reporter/*data-test-report-context* data-spec#]
                                       ~@body)
-                                    (reporter/write data-spec-file# data-spec# message#)
                                     )))
                         :data-spec-key namespaced-test-key#)
            (fn [] (t/test-var (var ~n)))))))
diff --git a/main/src/data_test/reporter.clj b/main/src/data_test/reporter.clj
index b076fcd..e61d2fe 100644
--- a/main/src/data_test/reporter.clj
+++ b/main/src/data_test/reporter.clj
@@ -15,17 +15,48 @@
 ; limitations under the License.
 (ns data-test.reporter
   (:require
+   [clojure.test :as t]
    [clojure.java.io :as io]
-   [clojure.string :as str]
-   [schema.core :as s]
-   [aero.core :as aero]))
+   [clojure.stacktrace :as stack]
+   [schema.core :as s]))
 
-(s/defn write
-  [data-spec-file :- s/Str
-   data-spec
-   message]
-  (let [output-file (str "target/datatest/" data-spec-file)]
-    (clojure.java.io/make-parents output-file)
+(def ^:dynamic 
+  *data-test-report-context* nil)
+
+(s/defn write-data-test-output
+  [m]
+  (let [data-spec-file (:data-spec-file *data-test-report-context*)
+        output-file (str "target/datatest/" data-spec-file)]
+    (io/make-parents output-file)
     (spit output-file (merge
-                        {:message (str message)}
-                        data-spec))))
\ No newline at end of file
+                       {:test-event m}
+                       *data-test-report-context*))))
+
+(defmethod t/report :default [m]
+  (t/with-test-out (prn m)))
+
+(defmethod t/report :pass [m]
+  (when *data-test-report-context* (write-data-test-output m))
+  (t/with-test-out (t/inc-report-counter :pass)))
+
+(defmethod t/report :fail [m]
+  (t/with-test-out
+    (t/inc-report-counter :fail)
+    (println "\nFAIL in" (t/testing-vars-str m))
+    (when (seq t/*testing-contexts*) (println (t/testing-contexts-str)))
+    (when-let [message (:message m)] (println message))
+    (println "expected:" (pr-str (:expected m)))
+    (println "  actual:" (pr-str (:actual m)))))
+
+(defmethod t/report :error [m]
+  (t/with-test-out
+    (t/inc-report-counter :error)
+    (println "\nERROR in" (t/testing-vars-str m))
+    (when (seq t/*testing-contexts*) (println (t/testing-contexts-str)))
+    (when-let [message (:message m)] (println message))
+    (println "expected:" (pr-str (:expected m)))
+    (print "  actual: ")
+    (let [actual (:actual m)]
+      (if (instance? Throwable actual)
+        (stack/print-cause-trace actual t/*stack-trace-depth*)
+        (prn actual)))))
\ No newline at end of file