Merge pull request #53 from edtsech/diff-map

Diff for maps
slagyr · Oct 30, 2013 · bd56ce4 · bd56ce4
2 parents 86a56d1 + f18b9c2
commit bd56ce4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/spec/speclj/should_spec.clj b/spec/speclj/should_spec.clj
@@ -128,6 +128,7 @@
       ;<-cljs-ignore
 
       )
+
 
     (context "two collections"
       (it "passes if target contains all items"
@@ -183,6 +184,11 @@
         (let [message (str "Expected contents: [1 1 1 5]" endl "              got: #{1 5}" endl "          missing: [1 1]" endl "            extra: []")]
           (should= message (failure-message (should== [1 1 1 5] #{1 5})))))
 
+      (it "checks equality of maps"
+        (should-pass! (should== {:a 1} {:a 1}))
+        (should-fail! (should== {:a 1} {:a 1 :b 2}))
+        (should= (str "Expected contents: {:a 1}" endl "              got: {:a 1, :b 2}" endl "          missing: nil" endl "            extra: {:b 2}") (failure-message (should== {:a 1} {:a 1 :b 2}))))
+
       ))
 
   (context "should-not=="

diff --git a/src/speclj/core.clj b/src/speclj/core.clj
@@ -6,6 +6,7 @@
             [speclj.config]
             [speclj.platform]
             [speclj.run.standard])
+  (:use clojure.data)
   ;<-cljs-ignore
   )
 
@@ -261,14 +262,16 @@
            (recur (rest coll#) (conj seen# f#)))))))
 
 (defmacro -coll-difference [coll1 coll2]
-  `(loop [match-with# ~coll1 match-against# ~coll2 diff# []]
-     (if (empty? match-with#)
-       diff#
-       (let [f# (first match-with#)
-             r# (rest match-with#)]
-         (if (some #(= % f#) match-against#)
-           (recur r# (-remove-first match-against# f#) diff#)
-           (recur r# match-against# (conj diff# f#)))))))
+  `(if (map? ~coll1)
+     (first (diff ~coll1 ~coll2))
+     (loop [match-with# ~coll1 match-against# ~coll2 diff# []]
+       (if (empty? match-with#)
+         diff#
+         (let [f# (first match-with#)
+               r# (rest match-with#)]
+           (if (some #(= % f#) match-against#)
+             (recur r# (-remove-first match-against# f#) diff#)
+             (recur r# match-against# (conj diff# f#))))))))
 
 (defmacro -difference-message [expected actual extra missing]
   `(str