Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider results outside of :var blocks #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions test-report/src/test_report/summary.clj
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
(ns test-report.summary
(:require [test-report.message :as message]))

(def transform-ns-results
(comp (filter message/result?)
(map (fn [result] {:results [(dissoc result :time)]}))))

(defn- map-nested-between [f begin-pred end-pred values]
(loop [values values
acc []]
(let [[begin & after-begin] (drop-while (complement begin-pred) values)
[between [end & after-end]] (split-with (complement end-pred) after-begin)]
(let [[before-begin [begin & after-begin]] (split-with (complement begin-pred) values)
[between [end & after-end]] (split-with (complement end-pred) after-begin)
results (into acc transform-ns-results before-begin)]
(if begin
(recur after-end (conj acc (f begin end between)))
acc))))
(recur after-end (conj results (f begin end between)))
results))))

(defn- duration [begin end]
(- (:time end) (:time begin)))
Expand Down
29 changes: 24 additions & 5 deletions test-report/test/test_report/summary_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
(intern 'example.first-test 'erroring (fn []))
(create-ns 'example.second-test)
(intern 'example.second-test 'passing (fn []))
(create-ns 'example.empty-since-fixture-failed-test)
(intern 'example.empty-since-fixture-failed-test 'erroring (fn []))

(deftest summarize-messages
(let [messages [{:type :begin-test-ns
Expand Down Expand Up @@ -71,11 +73,20 @@
{:type :end-test-ns
:ns (find-ns 'example.second-test)
:time 116894654251062}
{:type :begin-test-ns
:ns (find-ns 'example.empty-since-fixture-failed-test)
:time 116894653100547}
{:type :error
:message "smth"
:time 116894653734493}
{:type :end-test-ns
:ns (find-ns 'example.empty-since-fixture-failed-test)
:time 116894654251062}
{:type :summary
:test 5
:pass 4
:fail 1
:error 1
:error 2
:time 116894654397872}]]
(is (= {:namespaces [{:ns (find-ns 'example.first-test)
:time 25712629
Expand Down Expand Up @@ -106,10 +117,18 @@
:assertion 1
:pass 1
:fail 0
:error 0}}]
:summary {:test 5
:assertion 6
:error 0}}
{:ns (find-ns 'example.empty-since-fixture-failed-test)
:time 1150515
:tests [{:results [{:message "smth" :type :error}]}]
:summary {:test 1
:assertion 1
:pass 0
:fail 0
:error 1}}]
:summary {:test 6
:assertion 7
:pass 4
:fail 1
:error 1}}
:error 2}}
(summarize messages)))))