From 12798cfe937a915b23f0be0c95545f5ebad6b7d1 Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <kmrozek+git@proton.me> Date: Tue, 12 Dec 2023 11:07:03 +0000 Subject: [PATCH] Print testing contexts before test --- clojure/src/test_runner.clj | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index af558db..598d130 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -1,4 +1,7 @@ -(ns test-runner) +(ns test-runner + (:require + [clojure.string :as string] + [clojure.test :as t])) (def class-cache-dir ".cache/classes") (.mkdirs (java.io.File. class-cache-dir)) @@ -9,8 +12,10 @@ ~@body)) (with-class-cache - (require '[clojure.test :as t])) + (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] @@ -29,6 +34,21 @@ (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)) @@ -55,7 +75,9 @@ (println (str "ERROR-CONTINUE:ACTUAL:" (if (instance? Throwable (:actual m)) (ex-message (:actual m)) - (pr-str (:actual m)))))))) + (pr-str (:actual m))))) + (when (instance? Throwable (:actual m)) + (.printStackTrace (:actual m)))))) (defmethod vim-report :default [_]) @@ -100,6 +122,16 @@ (filter (comp test-files :file)) (map :ns) (set))] + + (set-validator! #'t/*testing-contexts* + (let [validator (get-validator #'t/*testing-contexts*)] + (fn [v] + (println "Testing:" (string/join " " v)) + (println) + (if validator + (validator v) + true)))) + (with-redefs [t/report vim-report] (System/exit (if (pos? (if (and -test-file -test-line) -- Gitblit v1.9.3