Get rid of a few excessive requires and duplicated record values

This commit is contained in:
Miloslav Nenadal 2016-02-21 00:27:50 +01:00
parent 9cc02ff5bc
commit 87f311c950
5 changed files with 12 additions and 11 deletions

View file

@ -7,9 +7,9 @@
(if-let [more# (seq (list ~@more))]
(let [result# (apply = a# more#)]
(if result#
(cljs.test/do-report {:type :pass, :message ~msg,
(~'cljs.test/do-report {:type :pass, :message ~msg,
:expected a#, :actual more#})
(cljs.test/do-report {:type :fail, :message ~msg,
(~'cljs.test/do-report {:type :fail, :message ~msg,
:expected a#, :actual more#,
:diffs (map vector
more#
@ -21,3 +21,6 @@
(defmethod assert-expr '= [menv msg [_ a & more]]
(=-body msg a more))
(defmethod assert-expr 'cljs.core/= [menv msg [_ a & more]]
(=-body msg a more))

View file

@ -128,11 +128,11 @@ FAIL in (t-records) (:)
these should not print as plain maps
expected:
##pjstadig.humane-test-output.records-test.ARecord{:foo :foo}{:foo:foo}
#pjstadig.humane-test-output.records-test.ARecord{:foo:foo}
actual:
##pjstadig.humane-test-output.records-test.ARecord{:foo :bar}{:foo:bar}
#pjstadig.humane-test-output.records-test.ARecord{:foo:bar}
diff:
-
@ -146,7 +146,7 @@ FAIL in (t-records) (:)
there should be a diff here
expected:
##pjstadig.humane-test-output.records-test.ARecord{:foo :foo}{:foo:foo}
#pjstadig.humane-test-output.records-test.ARecord{:foo:foo}
actual:
{:foo :foo}
@ -158,11 +158,11 @@ FAIL in (t-records) (:)
and here
expected:
##pjstadig.humane-test-output.records-test.ARecord{:foo :foo}{:foo:foo}
#pjstadig.humane-test-output.records-test.ARecord{:foo:foo}
actual:
##pjstadig.humane-test-output.records-test.BRecord{:foo :foo}{:foo:foo}
#pjstadig.humane-test-output.records-test.BRecord{:foo:foo}
diff:
+

View file

@ -1,6 +1,5 @@
(ns pjstadig.humane-test-output.formatting-test
(:use [clojure.data :only [diff]])
(:require [cljs.test :refer [do-report]])
(:require-macros [cljs.test :refer [deftest testing is]]
[pjstadig.macro :refer [deftest+]]))

View file

@ -1,6 +1,5 @@
(ns pjstadig.humane-test-output.records-test
(:use [clojure.data :only [diff]])
(:require [cljs.test :refer [do-report]])
(:require-macros [cljs.test :refer [deftest testing is]]))
(defrecord ARecord [foo])

View file

@ -1,6 +1,6 @@
(ns pjstadig.run-all
(:require [cljs.test
:refer [inc-report-counter! testing-vars-str testing-contexts-str get-current-env]
:refer [inc-report-counter! testing-vars-str testing-contexts-str get-current-env do-report]
:refer-macros [run-all-tests run-tests]]
[pjstadig.humane-test-output.formatting-test]
[pjstadig.humane-test-output.records-test]
@ -13,7 +13,7 @@
(defn pprint-record [arec]
(pp/pprint-logical-block
:prefix (str "#" (with-out-str (print arec)) "{") :suffix "}"
:prefix (re-find #".*?\{" (with-out-str (print arec))) :suffix "}"
(pp/print-length-loop
[aseq (seq arec)]
(when aseq