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

wip [skip ci]

Browse source
This commit is contained in:
Michiel Borkent 2024-10-31 11:31:10 +01:00
parent d9c9b00c90
commit 9667dbf47b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
resources/src/babashka/clojure/test.clj
View file

@ -297,7 +297,6 @@
current assertion." current assertion."
{:added "1.1"} {:added "1.1"}
[m] [m]
(prn :m m)
(let [{:keys [file line]} m] (let [{:keys [file line]} m]
(str (str
;; Uncomment to include namespace in failure report: ;; Uncomment to include namespace in failure report:
@ -355,7 +354,6 @@
to pass test results to report." to pass test results to report."
{:added "1.2"} {:added "1.2"}
[m] [m]
(prn (:type m))
(report (report
(case (case
(:type m) (:type m)
@ -366,9 +364,7 @@
(str/starts-with? cl-name "clojure.core$ex_info"))) (str/starts-with? cl-name "clojure.core$ex_info")))
(.getStackTrace (Thread/currentThread)))) m) (.getStackTrace (Thread/currentThread)))) m)
:error (do :error (do
(prn :>> (ex-data (:actual m))) (merge m)) #_(merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m)
(let [{:keys [line file]} (ex-data (:actual m))]
(merge {:file file :line line} m))) #_(merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m)
m))) m)))
(defmethod report :default [m] (defmethod report :default [m]
@ -393,10 +389,12 @@
(when (seq *testing-contexts*) (println (testing-contexts-str))) (when (seq *testing-contexts*) (println (testing-contexts-str)))
(when-let [message (:message m)] (println message)) (when-let [message (:message m)] (println message))
(println "expected:" (pr-str (:expected m))) (println "expected:" (pr-str (:expected m)))
(print " actual: ") (println " actual:")
(let [actual (:actual m)] (let [actual (:actual m)]
(if (instance? Throwable actual) (if (instance? Throwable actual)
(stack/print-cause-trace actual *stack-trace-depth*) (if-let [s (:stacktrace m)]
(run! println s)
(stack/print-cause-trace actual *stack-trace-depth*))
(prn actual))))) (prn actual)))))
(defmethod report :summary [m] (defmethod report :summary [m]
@ -539,8 +537,6 @@
:expected '~form, :actual e#}))) :expected '~form, :actual e#})))
e#)))) e#))))
(prn :reload)
(defmacro try-expr (defmacro try-expr
"Used by the 'is' macro to catch unexpected exceptions. "Used by the 'is' macro to catch unexpected exceptions.
You don't call this." You don't call this."
@ -552,11 +548,15 @@
(let [cause# (ex-cause t#) (let [cause# (ex-cause t#)
exd# (ex-data t#) exd# (ex-data t#)
file# (:file exd#) file# (:file exd#)
line# (:line exd#)] line# (:line exd#)
message# (ex-message cause#)
stack# (-> (sci.core/stacktrace t#) (sci.core/format-stacktrace))]
(do-report (cond-> {:type :error, :message ~msg, (do-report (cond-> {:type :error, :message ~msg,
:expected '~form, :actual cause#} :expected '~form, :actual cause#}
file# (assoc :file file#) file# (assoc :file file#)
line# (assoc :line line#))))))) line# (assoc :line line#)
stack# (assoc :stacktrace stack#)
message# (assoc :message message#)))))))