Correctly format diff output when = is fully qualified.

src/pjstadig/humane_test_output.clj

@@ -3,24 +3,30 @@
   (:require [clojure.data :as data]
             [clojure.pprint :as pp]))
 
+(defn =-body
+  [msg a more]
+  `(let [a# ~a]
+     (if-let [more# (seq (list ~@more))]
+       (let [result# (apply = a# more#)]
+         (if result#
+           (do-report {:type :pass, :message ~msg,
+                       :expected a#, :actual more#})
+           (do-report {:type :fail, :message ~msg,
+                       :expected a#, :actual more#,
+                       :diffs (map vector
+                                   more#
+                                   (map #(take 2 (data/diff a# %))
+                                        more#))}))
+         result#)
+       (throw (Exception. "= expects more than one argument")))))
+
 (defonce activation-body
   (delay
    (when (not (System/getenv "INHUMANE_TEST_OUTPUT"))
      (defmethod assert-expr '= [msg [_ a & more]]
-       `(let [a# ~a]
+       (=-body msg a more))
-          (if-let [more# (seq (list ~@more))]
+     (defmethod assert-expr 'clojure.core/= [msg [_ a & more]]
-            (let [result# (apply = a# more#)]
+       (=-body msg a more))
-              (if result#
-                (do-report {:type :pass, :message ~msg,
-                            :expected a#, :actual more#})
-                (do-report {:type :fail, :message ~msg,
-                            :expected a#, :actual more#,
-                            :diffs (map vector
-                                        more#
-                                        (map #(take 2 (data/diff a# %))
-                                             more#))}))
-              result#)
-            (throw (Exception. "= expects more than one argument")))))
 
      (defmethod report :fail
        [{:keys [type expected actual diffs message] :as event}]

test/pjstadig/humane_test_output/formatting_test.clj

@@ -17,3 +17,10 @@
     (let [foo {:foo :bar :baz :quux :something "a long string?"
                :another-key "and another value"}]
       (is (list? foo)))))
+
+(defmacro deftest+
+  [test-name expected actual]
+  `(deftest ~test-name
+     (is (= ~expected ~actual))))
+
+(deftest+ t-macro-wrapping 1 2)