fixes #23

Author: seancorfield

CHANGELOG.md

@@ -7,6 +7,7 @@
 Only accretive/fixative changes will be made from now on.
 
 * 2.0.next in progress
+  * Fix #23 by adding support for set-`in`-set expectations.
   * Documentation updates.
   * Build deps updates.
 

deps.edn

@@ -4,7 +4,7 @@
  :aliases
  {;; for help: clojure -A:deps -T:build help/doc
   :build {:deps {io.github.seancorfield/build-clj
-                 {:git/tag "v0.5.5" :git/sha "0527130"}}
+                 {:git/tag "v0.6.0" :git/sha "2451bea"}}
           :ns-default build}
 
   ;; versions to test against:

src/expectations/clojure/test.cljc

@@ -1,4 +1,4 @@
-;; copyright (c) 2018-2020 sean corfield, all rights reserved
+;; copyright (c) 2018-2021 sean corfield, all rights reserved
 
 (ns expectations.clojure.test
   "This namespace provides compatibility with `clojure.test` and related tooling.
@@ -297,18 +297,23 @@
 
       (and (sequential? a) (= 'in (first a)))
       (let [form `(~'expect ~e ~a)]
-        `(let [a#     ~(second a)
+        `(let [e#     ~e
+               a#     ~(second a)
                not-in# (str '~e " not found in " a#)
                msg#    (if (seq ~msg') (str ~msg' "\n" not-in#) not-in#)]
-           (cond (or (sequential? a#) (set? a#))
+           (cond (and (set? a#) (set? e#))
+                 ;; special case of set in set -- report any elements from
+                 ;; expected set that are not in the actual set:
+                 (t/is (~'=? (clojure.set/difference e# a#) #{} '~form) msg#)
+                 (or (sequential? a#) (set? a#))
                  (let [all-reports# (atom nil)
                        one-report# (atom nil)]
                    ;; we accumulate any and all failures and errors but we
                    ;; only accumulate passes if each sequential expectation
                    ;; fully passes (i.e., no failures or errors)
                    (with-redefs [t/do-report (all-report one-report#)]
                      (doseq [a'# a#]
-                       (expect ~e a'# msg# ~ex? ~form)
+                       (expect e# a'# msg# ~ex? ~form)
                        (if (or (contains? @one-report# :error)
                                (contains? @one-report# :fail))
                          (do
@@ -332,17 +337,16 @@
                        (when-let [r# (first (:fail @all-reports#))]
                          (t/do-report r#)))))
                  (map? a#)
-                 (let [e# ~e]
-                   (if (map? e#)
-                     (let [submap# (select-keys a# (keys e#))]
-                       (t/is (~'=? e# submap# '~form) ~msg'))
-                     (throw (#?(:clj IllegalArgumentException.
-                                :cljs js/Error.)
-                              "'in' requires map or sequence"))))
+                 (if (map? e#)
+                   (let [submap# (select-keys a# (keys e#))]
+                     (t/is (~'=? e# submap# '~form) ~msg'))
+                   (throw (#?(:clj IllegalArgumentException.
+                              :cljs js/Error.)
+                           "'in' requires map or sequence")))
                  :else
                  (throw (#?(:clj IllegalArgumentException.
                             :cljs js/Error.)
-                          "'in' requires map or sequence")))))
+                         "'in' requires map or sequence")))))
 
       (and (sequential? e) (= 'more (first e)))
       (let [es (mapv (fn [e] `(expect ~e ~a ~msg ~ex? ~e')) (rest e))]

test/expectations/clojure/test_test.cljc

@@ -1,4 +1,4 @@
-;; copyright (c) 2019-2020 sean corfield, all rights reserved
+;; copyright (c) 2019-2021 sean corfield, all rights reserved
 
 (ns expectations.clojure.test-test
   "Test the testing framework -- this is sometimes harder than you might think!
@@ -104,6 +104,7 @@
 
 (deftest collection-test
   (is (sut/expect {:foo 1} (in {:foo 1 :cat 4})))
+  (is (sut/expect #{1 2} (in #{0 1 2 3})))
   ;; TODO: need better tests here
   (is (nil? (sut/expect :foo (in #{:foo :bar}))))
   (is (nil? (sut/expect :foo (in [:bar :foo])))))