From 11f9a1fae342a313457dabb773fecce63dc1d978 Mon Sep 17 00:00:00 2001
From: Konrad Mrożek <konrad.mrozek@shareablee.com>
Date: Tue, 25 Jul 2023 09:36:58 +0000
Subject: [PATCH] Remove printing elapsed time
---
clojure/src/test_runner.clj | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj
index 82ba123..57864bc 100644
--- a/clojure/src/test_runner.clj
+++ b/clojure/src/test_runner.clj
@@ -1,15 +1,25 @@
-(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))
-(defmulti emacs-report :type)
+(with-class-cache
+ (require '[clojure.test :as t]))
-(defmethod emacs-report :fail
+(defmulti vim-report :type)
+
+(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*
@@ -32,7 +42,7 @@
e-line)))))
(:line m)))
-(defmethod emacs-report :error
+(defmethod vim-report :error
[m]
(when-let [source-file (some-> t/*testing-vars*
first
@@ -46,14 +56,26 @@
(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"}}]
+ (with-class-cache
(compile 'test-runner)
(println "Detecting test files in" -test-file)
(let [test-files (->> -test-file
@@ -65,6 +87,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))
@@ -72,14 +98,19 @@
(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