Merge pull request #437 from AlexChalk/expectations-fix

deep-diff clojure-expectations' `:actual (not=` output format

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- deep-diff `:actual (not=` output format.
+
 ## Added
 
 ## Fixed

src/kaocha/report.clj

@@ -238,15 +238,24 @@
                    :actual '~form})
     (t/assert-predicate msg form)))
 
+(defmulti sexpr-for-diff
+  (fn [m] (first (:actual m))))
+
+;; e.g. (not= ...)
+(defmethod sexpr-for-diff 'not= [m]
+  (-> m :actual))
+
+;; e.g. (not (= ...))
+(defmethod sexpr-for-diff :default [m]
+  (-> m :actual second))
+
 (defn print-expression [m]
   (let [printer (output/printer)]
-    ;; :actual is of the form (not (= ...))
-
     (if (and (not= (:type m) ::one-arg-eql)
-             (seq? (second (:actual m)))
-             (> (count (second (:actual m))) 2))
+             (seq? (sexpr-for-diff m))
+             (> (count (sexpr-for-diff m)) 2))
 
-      (let [[_ expected & actuals] (-> m :actual second)]
+      (let [[_ expected & actuals] (sexpr-for-diff m)]
         (output/print-doc
          [:span
           "Expected:" :line
@@ -422,7 +431,6 @@
   (t/with-test-out
     (prn (util/minimal-test-event m))))
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (def dots

test/unit/kaocha/report_test.clj

@@ -157,6 +157,15 @@
            (report/print-expr {:expected '(= 1 (+ 1 1))
                           :actual '(not (= 1 2))})))))
 
+(deftest print-expression-test
+  (is (= "Expected:\n  1\nActual:\n  -1 +2\n"
+         (with-out-str
+           (report/print-expression {:expected '(= 1 (+ 1 1))
+                                     :actual '(not (= 1 2))}))))
+  (is (= "Expected:\n  1\nActual:\n  -1 +2\n"
+         (with-out-str
+           (report/print-expression {:expected '(= 1 (+ 1 1))
+                                     :actual '(not= 1 2)})))))
 (deftest fail-summary-test
   (is (= (str   "\n"
                 "FAIL in foo/bar-test (foo.clj:42)\n"