From 3dde4ce4104db48cc12581e3b58f5200b957f308 Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <konrad.mrozek@shareablee.com> Date: Wed, 19 Jul 2023 14:51:23 +0000 Subject: [PATCH] Implement running the closest test --- clojure/src/test_runner.clj | 90 +++++++++++++++++++++++++++++++++----------- 1 files changed, 67 insertions(+), 23 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index ed5ab46..209c826 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -7,9 +7,15 @@ (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 :begin-test-var [m] + (println "\nExecuting" (:name (meta (:var m))))) + +(defmethod vim-report :fail [m] (t/with-test-out (when-let [source-file (some-> t/*testing-vars* @@ -20,27 +26,52 @@ (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] (re-matches #"^.*\.cljs?$" (.getName f))) -(defn -main [& {:strs [-test-file] :or {-test-file "test"}}] - (binding [*compile-files* true] +(defn find-closest-test [test-file test-line] + (->> (all-ns) + (mapcat ns-publics) + (map second) + (filter (comp :test meta)) + (filter (comp #{test-file} :file meta)) + (map #(vector % (- test-line (-> % meta :line)))) + (filterv (comp pos? second)) + (sort-by second) + first + first)) + +(defn -main [& {:strs [-test-file -test-line] :or {-test-file "test"}}] + (binding [*compile-files* true] (compile 'test-runner) (println "Detecting test files in" -test-file) (let [test-files (->> -test-file @@ -52,6 +83,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,14 +94,23 @@ (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)] - (+ total-fails - (:fail results 0) - (:error results 0))))) - 0 - test-namespaces)) - 1 - 0)))))) + (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))) + (reduce (fn [total-fails n] + (let [results (t/run-tests n)] + (+ total-fails + (:fail results 0) + (:error results 0)))) + 0 + test-namespaces))) + 1 + 0))))))) + + + + -- Gitblit v1.9.3