[#491] fix binding of clojure.test/report

src/babashka/impl/clojure/test.clj

@@ -234,6 +234,7 @@
     babashka.impl.clojure.test
   (:require [babashka.impl.common :refer [ctx]]
             [clojure.stacktrace :as stack]
+            [clojure.string :as str]
             [clojure.template :as temp]
             [sci.core :as sci]
             [sci.impl.analyzer :as ana]
@@ -334,14 +335,11 @@
    arguments for 'report'."
     :dynamic true
     :added "1.1"}
-  report :type)
+  report-impl :type)
 
-(defn- stacktrace-file-and-line
+(def tns (sci/create-ns 'clojure.test nil))
-  [stacktrace]
+
-  (if (seq stacktrace)
+(def report (sci/copy-var report-impl tns))
-    (let [^StackTraceElement s (first stacktrace)]
-      {:file (.getFileName s) :line (.getLineNumber s)})
-    {:file nil :line nil}))
 
 (defn do-report
   "Add file and line information to a test result and call report.
@@ -353,16 +351,16 @@
    (case
        (:type m)
      :fail m
-     :error (merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m)
+     :error m
      m)))
 
-(defmethod report :default [m]
+(defmethod report-impl :default [m]
   (with-test-out-internal (prn m)))
 
-(defmethod report :pass [m]
+(defmethod report-impl :pass [m]
   (with-test-out-internal (inc-report-counter :pass)))
 
-(defmethod report :fail [m]
+(defmethod report-impl :fail [m]
   (with-test-out-internal
     (inc-report-counter :fail)
     (println "\nFAIL in" (testing-vars-str m))
@@ -371,7 +369,7 @@
     (println "expected:" (pr-str (:expected m)))
     (println "  actual:" (pr-str (:actual m)))))
 
-(defmethod report :error [m]
+(defmethod report-impl :error [m]
   (with-test-out-internal
     (inc-report-counter :error)
     (println "\nERROR in" (testing-vars-str m))
@@ -384,20 +382,20 @@
         (stack/print-cause-trace actual @stack-trace-depth)
         (prn actual)))))
 
-(defmethod report :summary [m]
+(defmethod report-impl :summary [m]
   (with-test-out-internal
     (println "\nRan" (:test m) "tests containing"
              (+ (:pass m) (:fail m) (:error m)) "assertions.")
     (println (:fail m) "failures," (:error m) "errors.")))
 
-(defmethod report :begin-test-ns [m]
+(defmethod report-impl :begin-test-ns [m]
   (with-test-out-internal
     (println "\nTesting" (sci-namespaces/sci-ns-name (:ns m)))))
 
 ;; Ignore these message types:
-(defmethod report :end-test-ns [m])
+(defmethod report-impl :end-test-ns [m])
-(defmethod report :begin-test-var [m])
+(defmethod report-impl :begin-test-var [m])
-(defmethod report :end-test-var [m])
+(defmethod report-impl :end-test-var [m])
 
 
 
@@ -431,6 +429,8 @@
          (clojure.test/do-report {:type :pass, :message ~msg,
                                   :expected '~form, :actual (cons ~pred values#)})
          (clojure.test/do-report {:type :fail, :message ~msg,
+                                  :file clojure.core/*file*
+                                  :line ~(:line (meta form))
                                   :expected '~form, :actual (list '~'not (cons '~pred values#))}))
        result#)))
 
@@ -444,6 +444,8 @@
        (clojure.test/do-report {:type :pass, :message ~msg,
                                 :expected '~form, :actual value#})
        (clojure.test/do-report {:type :fail, :message ~msg,
+                                :file clojure.core/*file*
+                                :line ~(:line (meta form))
                                 :expected '~form, :actual value#}))
      value#))
 
@@ -464,7 +466,9 @@
 
 (defmethod assert-expr :always-fail [msg form]
   ;; nil test: always fail
-  `(clojure.test/do-report {:type :fail, :message ~msg}))
+  `(clojure.test/do-report {:type :fail, :message ~msg
+                            :file clojure.core/*file*
+                            :line ~(:line (meta form))}))
 
 (defmethod assert-expr :default [msg form]
   (if (and (sequential? form) (function? (first form)))
@@ -480,6 +484,8 @@
          (clojure.test/do-report {:type :pass, :message ~msg,
                                   :expected '~form, :actual (class object#)})
          (clojure.test/do-report {:type :fail, :message ~msg,
+                                  :file clojure.core/*file*
+                                  :line ~(:line (meta form))
                                   :expected '~form, :actual (class object#)}))
        result#)))
 
@@ -491,6 +497,8 @@
         body (nthnext form 2)]
     `(try ~@body
           (clojure.test/do-report {:type :fail, :message ~msg,
+                                   :file clojure.core/*file*
+                                   :line ~(:line (meta form))
                                    :expected '~form, :actual nil})
           (catch ~klass e#
             (clojure.test/do-report {:type :pass, :message ~msg,
@@ -512,7 +520,9 @@
               (if (re-find ~re m#)
                 (clojure.test/do-report {:type :pass, :message ~msg,
                                          :expected '~form, :actual e#})
-                (clojure.test/do-report {:type :fail, :message ~msg,
+                (clojure.test/do-report {:file clojure.core/*file*
+                                         :line ~(:line (meta form))
+                                         :type :fail, :message ~msg,
                                          :expected '~form, :actual e#})))
             e#))))
 
@@ -524,7 +534,9 @@
   [msg form]
   `(try ~(assert-expr msg form)
         (catch Throwable t#
-          (clojure.test/do-report {:type :error, :message ~msg,
+          (clojure.test/do-report {:file clojure.core/*file*
+                                   :line ~(:line (meta form))
+                                   :type :error, :message ~msg,
                                    :expected '~form, :actual t#}))))
 
 
@@ -690,7 +702,7 @@
 
 ;;; RUNNING TESTS: LOW-LEVEL FUNCTIONS
 
-(defn test-var
+(defn test-var-impl
   "If v has a function in its :test metadata, calls that function,
   with *testing-vars* bound to (conj *testing-vars* v)."
   {:dynamic true, :added "1.1"}
@@ -705,6 +717,8 @@
                          :expected nil, :actual e})))
       (do-report {:type :end-test-var, :var v}))))
 
+(def test-var (sci/copy-var test-var-impl tns))
+
 (defn test-vars
   "Groups vars by their namespace and runs test-vars on them with
    appropriate fixtures applied."
@@ -720,7 +734,8 @@
        (fn []
          (doseq [v vars]
            (when (:test (meta v))
-             (each-fixture-fn (fn [] (test-var v))))))))))
+             (each-fixture-fn (fn [] (test-var ;; this calls the sci var which can be rebound
+                                      v))))))))))
 
 (defn test-all-vars
   "Calls test-vars on every var interned in the namespace, with fixtures."

src/babashka/impl/test.clj

@@ -2,8 +2,6 @@
   (:require  [babashka.impl.clojure.test :as t]
              [sci.core :as sci]))
 
-(def tns (sci/create-ns 'clojure.test nil))
-
 (defn macrofy [v]
   (with-meta v {:sci/macro true}))
 
@@ -23,7 +21,7 @@
    'testing-vars-str t/testing-vars-str
    'testing-contexts-str t/testing-contexts-str
    'inc-report-counter t/inc-report-counter
-   'report (sci/copy-var t/report tns)
+   'report t/report
    'do-report t/do-report
    ;; assertion utilities
    'function? t/function?
@@ -49,7 +47,7 @@
    'compose-fixtures t/compose-fixtures
    'join-fixtures t/join-fixtures
    ;; running tests: low level
-   'test-var (sci/copy-var t/test-var tns)
+   'test-var t/test-var
    'test-vars t/test-vars
    'test-all-vars (with-meta t/test-all-vars {:sci.impl/op :needs-ctx})
    'test-ns (with-meta t/test-ns {:sci.impl/op :needs-ctx})

test-resources/babashka/test_report.clj

@@ -0,0 +1,10 @@
+(ns foo
+  (:require
+   [clojure.test :as t]))
+
+(t/deftest bar
+  (t/is (= 1 2) "1 is not equal to 2"))
+
+(binding [t/report (fn [m]
+                     (prn (update m :var (comp :name meta))))]
+  (t/test-var #'bar))

test/babashka/test_test.clj

@@ -1,6 +1,7 @@
 (ns babashka.test-test
   (:require
    [babashka.test-utils :as tu]
+   [clojure.edn :as edn]
    [clojure.java.io :as io]
    [clojure.string :as str]
    [clojure.test :as t :refer [deftest is]]))
@@ -73,3 +74,12 @@
 (deftest rebind-vars-test
   (is (bb "(binding [clojure.test/report (constantly true)] nil)"))
   (is (bb "(binding [clojure.test/test-var (constantly true)] nil)")))
+
+(deftest rebind-report-test
+  (let [[m1 m2 m3]
+        (edn/read-string (format "[%s]" (bb (io/file "test-resources" "babashka" "test_report.clj"))))]
+    (is (= m1 '{:type :begin-test-var, :var bar}))
+    (is (str/includes? (:file m2) "test_report.clj"))
+    (is (= (:message m2) "1 is not equal to 2"))
+    (is (= (:line m2) 6))
+    (is (= m3 '{:type :end-test-var, :var bar}))))