From 55439f8b3d9636ab73c32f40d7aa0827481159ed Mon Sep 17 00:00:00 2001
From: Konrad Mrożek <konrad.mrozek@shareablee.com>
Date: Fri, 14 Jul 2023 08:35:34 +0000
Subject: [PATCH] Add malli instrumentation support
---
clojure/src/test_runner.clj | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj
index ed5ab46..c15ce04 100644
--- a/clojure/src/test_runner.clj
+++ b/clojure/src/test_runner.clj
@@ -7,9 +7,12 @@
(when-not (.exists (java.io.File. "classes"))
(.. (java.io.File. "classes") mkdir))
-(defmulti emacs-report :type)
+(defmulti vim-report :type)
-(defmethod emacs-report :fail
+(defmethod vim-report :begin-test-ns [m]
+ (println "\nTesting" (ns-name (:ns m))))
+
+(defmethod vim-report :fail
[m]
(t/with-test-out
(when-let [source-file (some-> t/*testing-vars*
@@ -20,20 +23,33 @@
(println (str "FAIL-CONTINUE:EXPECTED:" (pr-str (:expected m))))
(println (str "FAIL-CONTINUE:ACTUAL:" (pr-str (:actual m)))))))
-(defmethod emacs-report :error
+(defn- find-line-number [source-file m]
+ (if (instance? Throwable (:actual m))
+ (let [fname (-> source-file (java.io.File.) (.getName))]
+ (->> m
+ :actual
+ Throwable->map
+ :trace
+ (some (fn [[_ _ e-file e-line]]
+ (when (= e-file fname)
+ e-line)))))
+ (:line m)))
+
+(defmethod vim-report :error
[m]
(when-let [source-file (some-> t/*testing-vars*
first
meta
:file)]
- (println (str "ERROR:" source-file ":" (:line m) ":" (t/testing-vars-str m) ":" (t/testing-contexts-str) ":" (:message m "FAIL")))
- (println (str "ERROR-CONTINUE:EXPECTED:" (pr-str (:expected m))))
- (println (str "ERROR-CONTINUE:ACTUAL:"
- (if (instance? Throwable (:actual m))
- (ex-message (:actual m))
- (pr-str (:actual m)))))))
+ (let [line (find-line-number source-file m)]
+ (println (str "ERROR:" source-file ":" line ":" (t/testing-vars-str m) ":" (t/testing-contexts-str) ":" (:message m "FAIL")))
+ (println (str "ERROR-CONTINUE:EXPECTED:" (pr-str (:expected m))))
+ (println (str "ERROR-CONTINUE:ACTUAL:"
+ (if (instance? Throwable (:actual m))
+ (ex-message (:actual m))
+ (pr-str (:actual m))))))))
-(defmethod emacs-report :default
+(defmethod vim-report :default
[_])
(defn- clj-file? [f]
@@ -52,6 +68,10 @@
(set))]
(println "Loading test files...")
(run! load-file test-files)
+ (when (find-ns 'malli.core)
+ (println "Malli detected. Instrument functions...")
+ (require 'malli.dev)
+ ((find-var 'malli.dev/start!)))
(let [test-namespaces (->> (all-ns)
(mapcat ns-publics)
(map (comp meta second))
@@ -59,10 +79,9 @@
(filter (comp test-files :file))
(map :ns)
(set))]
- (println "Running tests on:" (map ns-name test-namespaces))
(System/exit (if (pos? (reduce (fn [total-fails n]
- (with-redefs [t/report emacs-report]
- (let [results (t/run-tests n)]
+ (with-redefs [t/report vim-report]
+ (let [results (t/run-tests n)]
(+ total-fails
(:fail results 0)
(:error results 0)))))
--
Gitblit v1.9.3