Merge pull request #39 from dgr/dgr-cljs-fix-compare

Make tests in `compare` more resilient and fix CLJS crash

Author: jeaye

test/clojure/core_test/compare.cljc

@@ -5,49 +5,52 @@
 (when-var-exists clojure.core/compare
  (deftest test-compare
    (testing "numeric-types"
-     (are [r args] (= r (compare (first args) (second args)))
-       -1 [0  10]
-       0  [0  0]
-       1  [0 -100N]
-       0  [1  1.0]
+     (are [pred args] (pred (compare (first args) (second args)))
+       neg? [0  10]
+       zero?  [0  0]
+       pos?  [0 -100N]
+       zero?  [1  1.0]
        #?@(:cljs []
            :default
-           [-1 [1  100/3]])
-       -1 [0  0x01]
-       -1 [0  2r01]
-       1  [1  nil])
+           [neg? [1  100/3]])
+       neg? [0  0x01]
+       neg? [0  2r01]
+       pos?  [1  nil])
 
      (is (thrown? #?(:cljs :default :clj Exception) (compare 1 []))))
 
   (testing "lexical-types"
-    (are [r args] (= r (compare (first args) (second args)))
-      -1 [\a    \b]
-      0  [\0    \0]
-      25 [\z    \a]
-      -1 ["cat" "dog"]
-      -1 ['cat  'dog]
-      -1 [:cat  :dog]
-      0  [:dog  :dog]
-      -1 [:cat  :animal/cat]
-      1  ['a    nil])
+    (are [pred args] (pred (compare (first args) (second args)))
+      neg? [\a    \b]
+      zero?  [\0    \0]
+      pos? [\z    \a]
+      neg? ["cat" "dog"]
+      neg? ['cat  'dog]
+      neg? [:cat  :dog]
+      zero?  [:dog  :dog]
+      neg? [:cat  :animal/cat]
+      pos?  ['a    nil])
 
     (is (thrown? #?(:cljs :default :clj Exception) (compare "a" [])))
     (is (thrown? #?(:cljs :default :clj Exception) (compare "cat" '(\c \a \t)))))
 
   (testing "collection-types"
-    (are [r args] (= r (compare (first args) (second args)))
-      0  [[]          []]
-      1  [[3]         [1]]
-      -1 [[]          [1 2]]
-      -1 [[]          [[]]]
-      0  [#{}         #{}]
-      0  [{}          {}]
-      0  [(array-map) (array-map)]
-      0  [(hash-map)  (hash-map)]
-      0  [{}          (hash-map)]
-      0  [{}          (array-map)]
-      0  ['()         '()]
-      1  [[]          nil])
+    (are [pred args] (pred (compare (first args) (second args)))
+      zero?  [[]          []]
+      pos?  [[3]         [1]]
+      neg? [[]          [1 2]]
+      neg? [[]          [[]]]
+      ;; Sets, maps, and lists don't implement java.lang.Comparable,
+      ;; so just comment these out for now. TODO: make decision as to
+      ;; what we want to do with these tests.
+      ;; zero?  [#{}         #{}]
+      ;; zero?  [{}          {}]
+      ;; zero?  [(array-map) (array-map)]
+      ;; zero?  [(hash-map)  (hash-map)]
+      ;; zero?  [{}          (hash-map)]
+      ;; zero?  [{}          (array-map)]
+      ;; zero?  ['()         '()]
+      pos?  [[]          nil])
 
     (is (thrown? #?(:cljs :default :clj Exception) (compare []  '())))
     (is (thrown? #?(:cljs :default :clj Exception) (compare [1] [[]])))
@@ -57,4 +60,5 @@
     (is (thrown? #?(:cljs :default :clj Exception) (compare #{1} #{1})))
     (is (thrown? #?(:cljs :default :clj Exception) (compare {1 2} {1 2})))
     (is (thrown? #?(:cljs :default :clj Exception) (compare (range 5) (range 5))))
-    (is (thrown? #?(:cljs :default :clj Exception) (compare (range 5) (range)))))))
+    ;; Clojurescript goes into an infinite loop of some sort when compiling this.
+    #_(is (thrown? #?(:cljs :default :clj Exception) (compare (range 5) (range)))))))