Skip to content
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
3 changes: 2 additions & 1 deletion eftest/src/eftest/output_capture.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
(def ^:dynamic *test-buffer* nil)

(defn read-test-buffer []
(String. (.toByteArray *test-buffer*)))
(when *test-buffer*
(String. (.toByteArray *test-buffer*))))

(def active-buffers (atom #{}))

Expand Down
12 changes: 10 additions & 2 deletions eftest/src/eftest/report/pretty.clj
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@

(defn- testing-vars-str [{:keys [file line]}]
(let [test-var (first test/*testing-vars*)]
(str (:clojure-frame *fonts*) (-> test-var meta :ns ns-name) "/"
(:function-name *fonts*) (-> test-var meta :name) (:reset *fonts*)
(str (:clojure-frame *fonts*)
(if test-var
(-> test-var meta :ns ns-name)
"unknown-namespace")
"/"
(:function-name *fonts*)
(if test-var
(-> test-var meta :name)
"unknown-test")
(:reset *fonts*)
(when (or file line)
(str " (" (:source *fonts*) file ":" line (:reset *fonts*) ")")))))

Expand Down
18 changes: 18 additions & 0 deletions eftest/test/eftest/report_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,21 @@
pretty-nil
"\n")
result))))

(deftest report-outside-testing-vars
(let [pretty-nil (puget/pprint-str nil {:print-color true
:print-meta false})]
(is (= (str "\nFAIL in unknown-namespace/unknown-test (report_test.clj:10)\nfoo\nexpected: "
pretty-nil
"\n actual: "
pretty-nil
"\n")
(with-out-str
(binding [*testing-vars* []
pretty/*fonts* {}
*report-counters* (ref *initial-report-counters*)
*test-out* *out*]
(pretty/report {:type :fail
:message "foo"
:file "report_test.clj"
:line 10})))))))