From f5c51800f90878d1318ea54b2df35d7755170738 Mon Sep 17 00:00:00 2001
From: Konrad Mrożek <konrad.mrozek@shareablee.com>
Date: Thu, 22 Jun 2023 13:47:18 +0000
Subject: [PATCH] Improved detection of test namespaces

---
 .gitignore                  |    3 +++
 clojure/src/test_runner.clj |   44 ++++++++++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..71b2801
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.clj-kondo
+.cpcache
+.lsp
diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj
index d7c5118..d5b0156 100644
--- a/clojure/src/test_runner.clj
+++ b/clojure/src/test_runner.clj
@@ -39,21 +39,29 @@
 (defn -main  [& [test-file]]
   (binding  [*compile-files* true]
     (compile 'test-runner)
-    (let  [test-namespaces (->> (or test-file  "test")
-                                (java.io.File.)
-                                (file-seq)
-                                (filter (memfn isFile))
-                                (map (memfn getPath))
-                                (map load-file)
-                                (map (comp :ns meta))
-                                (into #{}))]
-      (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)))))
+    (let [test-files (->> (or test-file  "test")
+                          (java.io.File.)
+                          (file-seq)
+                          (filter (memfn isFile))
+                          (map (memfn getAbsolutePath))
+                          (set))]
+      (println "Loading test files...")
+      (run! load-file test-files)
+      (let [test-namespaces (->> (all-ns)
+                                 (mapcat ns-publics)
+                                 (map (comp meta second))
+                                 (filter :test)
+                                 (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))))))

--
Gitblit v1.9.3