From 2f8117ea9542d0184948e01559c9219e1d5b829b Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <kmrozek@comscore.com> Date: Fri, 28 Jul 2023 13:02:09 +0000 Subject: [PATCH] Fix exit code and use run-test-var from clojure 1.11 --- clojure/src/test_runner.clj | 79 ++++++++++++++++++++++++++------------- 1 files changed, 53 insertions(+), 26 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index 4a4cde9..718abdd 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -1,11 +1,15 @@ -(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])) (defmulti vim-report :type) @@ -17,14 +21,14 @@ (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)))))) (defn- find-line-number [source-file m] (if (instance? Throwable (:actual m)) @@ -40,6 +44,7 @@ (defmethod vim-report :error [m] + (t/inc-report-counter :error) (when-let [source-file (some-> t/*testing-vars* first meta @@ -58,8 +63,20 @@ (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"}}] + (with-class-cache (compile 'test-runner) (println "Detecting test files in" -test-file) (let [test-files (->> -test-file @@ -82,13 +99,23 @@ (filter (comp test-files :file)) (map :ns) (set))] - (System/exit (if (pos? (reduce (fn [total-fails n] - (with-redefs [t/report vim-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/run-test-var (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