luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reported file

Browse source
This commit is contained in:
Michiel Borkent 2020-01-30 10:30:11 +01:00
parent d8eb74a13b
commit 8570eef019
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/babashka/impl/clojure/test.clj
View file

@ -302,7 +302,7 @@
current assertion." current assertion."
{:added "1.1"} {:added "1.1"}
[m] [m]
(let [{:keys [file line]} m] (let [{:keys [:file :line]} (meta (first @testing-vars))]
(str (str
;; Uncomment to include namespace in failure report: ;; Uncomment to include namespace in failure report:
;;(ns-name (:ns (meta (first *testing-vars*)))) "/ " ;;(ns-name (:ns (meta (first *testing-vars*)))) "/ "
@ -337,15 +337,6 @@
:added "1.1"} :added "1.1"}
report :type) report :type)
#_(defn- file-and-line
{:deprecated "1.8"}
[^Throwable exception depth]
(let [stacktrace (.getStackTrace exception)]
(if (< depth (count stacktrace))
(let [^StackTraceElement s (nth stacktrace depth)]
{:file (.getFileName s) :line (.getLineNumber s)})
{:file nil :line nil})))
(defn- stacktrace-file-and-line (defn- stacktrace-file-and-line
[stacktrace] [stacktrace]
(if (seq stacktrace) (if (seq stacktrace)
@ -362,12 +353,7 @@
(report (report
(case (case
(:type m) (:type m)
:fail (merge (stacktrace-file-and-line (drop-while :fail m
#(let [cl-name (.getClassName ^StackTraceElement %)]
(or (str/starts-with? cl-name "java.lang.")
(str/starts-with? cl-name "clojure.test$")
(str/starts-with? cl-name "clojure.core$ex_info")))
(.getStackTrace (Thread/currentThread)))) m)
:error (merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m) :error (merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m)
m))) m)))