From 8b8f7606f8f7189315e5582a4bd6cd1118f78583 Mon Sep 17 00:00:00 2001
From: Konrad Mrożek <kmrozek@comscore.com>
Date: Wed, 06 Sep 2023 11:59:12 +0000
Subject: [PATCH] Add diff2 to present difference between results
---
clojure/src/test_runner.clj | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj
index 209c826..e8cc9f9 100644
--- a/clojure/src/test_runner.clj
+++ b/clojure/src/test_runner.clj
@@ -1,12 +1,18 @@
-(binding [*compile-files* true]
- (require 'clojure.test))
+(ns test-runner)
-(ns test-runner
- (:require [clojure.test :as t]))
+(def class-cache-dir ".cache/classes")
+(.mkdirs (java.io.File. class-cache-dir))
-(when-not (.exists (java.io.File. "classes"))
- (.. (java.io.File. "classes") mkdir))
+(defmacro with-class-cache [& body]
+ `(binding [*compile-path* class-cache-dir
+ *compile-files* true]
+ ~@body))
+(with-class-cache
+ (require '[clojure.test :as t]
+ '[lambdaisland.deep-diff2 :as ddiff]))
+
+(def no-colors-printer (ddiff/printer {:print-color false}))
(defmulti vim-report :type)
(defmethod vim-report :begin-test-ns [m]
@@ -17,14 +23,29 @@
(defmethod vim-report :fail
[m]
- (t/with-test-out
- (when-let [source-file (some-> t/*testing-vars*
- first
- meta
- :file)]
- (println (str "FAIL:" source-file ":" (:line m) ":" (t/testing-vars-str m) ":" (t/testing-contexts-str) ":" (:message m "FAIL")))
- (println (str "FAIL-CONTINUE:EXPECTED:" (pr-str (:expected m))))
- (println (str "FAIL-CONTINUE:ACTUAL:" (pr-str (:actual m)))))))
+ (t/inc-report-counter :fail)
+ (when-let [source-file (some-> t/*testing-vars*
+ first
+ meta
+ :file)]
+ (println (str "FAIL:" source-file ":" (:line m) ":" (t/testing-vars-str m) ":" (t/testing-contexts-str) ":" (:message m "FAIL")))
+ (println (str "FAIL-CONTINUE:EXPECTED:" (pr-str (:expected m))))
+ (println (str "FAIL-CONTINUE:ACTUAL:" (pr-str (:actual m))))))
+
+(defmethod t/assert-expr '= [msg form]
+ (let [args (rest form)
+ pred (first form)]
+ `(let [values# (list ~@args)
+ result# (apply ~pred values#)]
+ (if result#
+ (t/do-report {:type :pass, :message ~msg,
+ :expected '~form, :actual (cons '~pred values#)})
+ (do
+ (t/do-report {:type :fail, :message ~msg,
+ :expected '~form, :actual (list '~'not (cons '~pred values#))})
+ (-> (apply ddiff/diff values#)
+ (ddiff/pretty-print no-colors-printer))))
+ result#)))
(defn- find-line-number [source-file m]
(if (instance? Throwable (:actual m))
@@ -40,6 +61,7 @@
(defmethod vim-report :error
[m]
+ (t/inc-report-counter :error)
(when-let [source-file (some-> t/*testing-vars*
first
meta
@@ -71,7 +93,7 @@
first))
(defn -main [& {:strs [-test-file -test-line] :or {-test-file "test"}}]
- (binding [*compile-files* true]
+ (with-class-cache
(compile 'test-runner)
(println "Detecting test files in" -test-file)
(let [test-files (->> -test-file
@@ -86,7 +108,8 @@
(when (find-ns 'malli.core)
(println "Malli detected. Instrument functions...")
(require 'malli.dev)
- ((find-var 'malli.dev/start!)))
+ (require 'malli.dev.pretty)
+ ((find-var 'malli.dev/start!) {:report ((find-var 'malli.dev.pretty/thrower))}))
(let [test-namespaces (->> (all-ns)
(mapcat ns-publics)
(map (comp meta second))
@@ -97,10 +120,15 @@
(with-redefs [t/report vim-report]
(System/exit
(if (pos? (if (and -test-file -test-line)
- (let [results (t/test-vars [(find-closest-test (.. (java.io.File. -test-file) getAbsolutePath)
- (parse-long -test-line))])]
- (+ (:fail results 0)
- (:error results 0)))
+
+ (if-let [test-var (find-closest-test (.. (java.io.File. -test-file) getAbsolutePath)
+ (parse-long -test-line))]
+ (->> (t/run-test-var test-var)
+ ((juxt :fail :error))
+ (apply +))
+ (do
+ (println "No test found")
+ 0))
(reduce (fn [total-fails n]
(let [results (t/run-tests n)]
(+ total-fails
@@ -110,7 +138,3 @@
test-namespaces)))
1
0)))))))
-
-
-
-
--
Gitblit v1.9.3