From 9911d80418f2d1eb18c4b364d24aeb15a09cbc43 Mon Sep 17 00:00:00 2001 From: Konrad Mrozek <konrad.mrozek@gmail.com> Date: Tue, 05 Dec 2023 07:36:36 +0000 Subject: [PATCH] Make compatible with neovim --- clojure/src/test_runner.clj | 56 +++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 41 insertions(+), 15 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index 57864bc..c617c67 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -9,8 +9,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] @@ -21,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)) @@ -44,6 +61,7 @@ (defmethod vim-report :error [m] + (t/inc-report-counter :error) (when-let [source-file (some-> t/*testing-vars* first meta @@ -54,7 +72,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 [_]) @@ -90,7 +110,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)) @@ -101,10 +122,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 -- Gitblit v1.9.3