move more primitives, destructuring test ns

Author: dnolen

src/test/cljs/cljs/core_test.cljs

@@ -446,78 +446,6 @@
     (is (= (distinct [#{1 2} #{1 2}]) [#{1 2}]))
     (is (= (distinct [#{} #{}]) [#{}]))))
 
-(deftest test-destructuring
-  (testing "Testing destructuring"
-    (is (= [2 1] (let [[a b] [1 2]] [b a])))
-    (is (= #{1 2} (let [[a b] [1 2]] #{a b})))
-    (is (= [1 2] (let [{a :a b :b} {:a 1 :b 2}] [a b])))
-    (is (= [1 2] (let [{:keys [a b]} {:a 1 :b 2}] [a b])))
-    (is (= [1 2 [1 2]] (let [[a b :as v] [1 2]] [a b v])))
-    (is (= [1 42] (let [{:keys [a b] :or {b 42}} {:a 1}] [a b])))
-    (is (= [1 nil] (let [{:keys [a b] :or {c 42}} {:a 1}] [a b])))
-    (is (= [2 1] (let [[a b] '(1 2)] [b a])))
-    (is (= {1 2} (let [[a b] [1 2]] {a b})))
-    (is (= [2 1] (let [[a b] (seq [1 2])] [b a])))
-    (testing "namespaced keys"
-      (let [{:keys [:a :b]} {:a 1 :b 2}]
-        (testing "basic"
-          (is (= 1 a))
-          (is (= 2 b))))
-      (let [{:keys [:a/b :c/d]} {:a/b 1 :c/d 2}]
-        (testing "keyword syntax"
-          (is (= 1 b))
-          (is (= 2 d))))
-      (let [{:keys [a/b c/d]} {:a/b 1 :c/d 2}]
-        (testing "symbol syntax"
-          (is (= 1 b))
-          (is (= 2 d))))
-      (let [{:syms [a/b c/d]} {'a/b 1 'c/d 2}]
-        (testing ":syms"
-          (is (= 1 b))
-          (is (= 2 d))))
-      (let [{:keys [::s/x ::s/y]} {:clojure.string/x 1 :clojure.string/y 2}]
-        (testing ":keys"
-          (is (= x 1))
-          (is (= y 2))))
-      )))
-
-(deftest keywords-in-destructuring
-  (let [m {:a 1 :b 2}]
-    (let [{:keys [:a :b]} m]
-      (is (= [1 2] [a b])))
-    (let [{:keys [:a :b :c] :or {c 3}} m]
-      (is (= [1 2 3] [a b c])))))
-
-(deftest namespaced-keywords-in-destructuring
-  (let [m {:a/b 1 :c/d 2}]
-    (let [{:keys [:a/b :c/d]} m]
-      (is (= [1 2] [b d])))
-    (let [{:keys [:a/b :c/d :e/f] :or {f 3}} m]
-      (is (= [1 2 3] [b d f])))))
-
-(deftest namespaced-keys-in-destructuring
-  (let [m {:a/b 1 :c/d 2}]
-    (let [{:keys [a/b c/d]} m]
-      (is (= [1 2] [b d])))
-    (let [{:keys [a/b c/d e/f] :or {f 3}} m]
-      (is (= [1 2 3] [b d f])))))
-
-(deftest namespaced-syms-in-destructuring
-  (let [{:syms [a/b c/d e/f] :or {f 3}} {'a/b 1 'c/d 2}]
-    (is (= [1 2 3] [b d f]))))
-
-(deftest namespaced-keys-syntax
-  (let [{:a/keys [b c d] :or {d 3}} {:a/b 1 :a/c 2}]
-    (is (= [1 2 3] [b c d]))))
-
-(deftest namespaced-syms-syntax
-  (let [{:a/syms [b c d] :or {d 3}} {'a/b 1 'a/c 2}]
-    (is (= [1 2 3] [b c d]))))
-
-(deftest resolve-keyword-ns-alias-in-destructuring
-  (let [{:keys [::s/x ::s/y ::s/z] :or {z 3}} {:clojure.string/x 1 :clojure.string/y 2}]
-    (is (= [1 2 3] [x y z]))))
-
 (deftest test-in-operations
   (testing "Testing update-in"
     (is (= {:foo {:bar {:baz 1}}}
@@ -546,76 +474,6 @@
                [1 :bar 1 :buzz]))))
   )
 
-(deftest test-arrays
-  (testing "Testing array operations"
-    (let [a (to-array [1 2 3])]
-      (testing "basic ops"
-        (is (= [10 20 30] (seq (amap a i ret (* 10 (aget a i))))))
-        (is (= 6 (areduce a i ret 0 (+ ret (aget a i)))))
-        (is (= (seq a) (seq (to-array [1 2 3]))))
-        (is (= 42 (aset a 0 42)))
-        (is (not= (seq a) (seq (to-array [1 2 3]))))
-        (is (not= a (aclone a)))))
-    (let [a (array (array 1 2 3) (array 4 5 6))]
-      (testing "aget"
-        (is (= (aget a 0 1) 2))
-        (is (= (apply aget a [0 1]) 2))
-        (is (= (aget a 1 1) 5))
-        (is (= (apply aget a [1 1]) 5))
-        (aset a 0 0 "foo")
-        (is (= (aget a 0 0) "foo"))
-        (apply aset a [0 0 "bar"])
-        (is (= (aget a 0 0) "bar"))))))
-
-(defn- primitive-arrays-equal
-  [a b]
-  (= (js->clj a) (js->clj b)))
-
-(deftest test-make-array
-  (testing "Testing make-array"
-    (is (primitive-arrays-equal #js [] (make-array 0)))
-    (is (primitive-arrays-equal #js [] (apply make-array [0])))
-    (is (primitive-arrays-equal #js [nil] (make-array 1)))
-    (is (primitive-arrays-equal #js [nil] (apply make-array [1])))
-    (is (primitive-arrays-equal #js [nil nil] (make-array 2)))
-    (is (primitive-arrays-equal #js [nil nil] (apply make-array [2])))
-    (is (primitive-arrays-equal #js [] (make-array nil 0)))
-    (is (primitive-arrays-equal #js [] (apply make-array [nil 0])))
-    (is (primitive-arrays-equal #js [nil] (make-array nil 1)))
-    (is (primitive-arrays-equal #js [nil] (apply make-array [nil 1])))
-    (is (primitive-arrays-equal #js [nil nil] (make-array nil 2)))
-    (is (primitive-arrays-equal #js [nil nil] (apply make-array [nil 2])))
-    (is (primitive-arrays-equal #js [] (make-array nil 0 0)))
-    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 0])))
-    (is (primitive-arrays-equal #js [] (make-array nil 0 1)))
-    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 1])))
-    (is (primitive-arrays-equal #js [#js []] (make-array nil 1 0)))
-    (is (primitive-arrays-equal #js [#js []] (apply make-array [nil 1 0])))
-    (is (primitive-arrays-equal #js [#js [] #js []] (make-array nil 2 0)))
-    (is (primitive-arrays-equal #js [#js [] #js []] (apply make-array [nil 2 0])))
-    (is (primitive-arrays-equal #js [#js [nil]] (make-array nil 1 1)))
-    (is (primitive-arrays-equal #js [#js [nil]] (apply make-array [nil 1 1])))
-    (is (primitive-arrays-equal #js [#js [nil] #js [nil]] (make-array nil 2 1)))
-    (is (primitive-arrays-equal #js [#js [nil] #js [nil]] (apply make-array [nil 2 1])))
-    (is (primitive-arrays-equal #js [#js [nil nil] #js [nil nil]] (make-array nil 2 2)))
-    (is (primitive-arrays-equal #js [#js [nil nil] #js [nil nil]] (apply make-array [nil 2 2])))
-    (is (primitive-arrays-equal #js [] (make-array nil 0 0 0)))
-    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 0 0])))
-    (is (primitive-arrays-equal #js [] (make-array nil 0 1 1)))
-    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 1 1])))
-    (is (primitive-arrays-equal #js [#js []] (make-array nil 1 0 0)))
-    (is (primitive-arrays-equal #js [#js []] (apply make-array [nil 1 0 0])))
-    (is (primitive-arrays-equal #js [#js [] #js []] (make-array nil 2 0 0)))
-    (is (primitive-arrays-equal #js [#js [] #js []] (apply make-array [nil 2 0 0])))
-    (is (primitive-arrays-equal #js [#js [#js []]] (make-array nil 1 1 0)))
-    (is (primitive-arrays-equal #js [#js [#js []]] (apply make-array [nil 1 1 0])))
-    (is (primitive-arrays-equal #js [#js [#js [nil]]] (make-array nil 1 1 1)))
-    (is (primitive-arrays-equal #js [#js [#js [nil]]] (apply make-array [nil 1 1 1])))
-    (is (primitive-arrays-equal #js [#js [#js [nil nil] #js [nil nil]] #js [#js [nil nil] #js [nil nil]]]
-          (make-array nil 2 2 2)))
-    (is (primitive-arrays-equal #js [#js [#js [nil nil] #js [nil nil]] #js [#js [nil nil] #js [nil nil]]]
-          (apply make-array [nil 2 2 2])))))
-
 (deftest test-rearrange-sequential
   (testing "Test rearranging sequential collections"
     (is (= [1 2 3 4 5] (sort [5 3 1 4 2])))
@@ -1354,83 +1212,6 @@
       (is (= expected (hash uuid)))
       (is (= expected (.-__hash uuid))))))
 
-(deftest test-comparable
-  (testing "Testing IComparable"
-    (is (=  0 (compare false false)))
-    (is (= -1 (compare false true)))
-    (is (=  1 (compare true  false)))
-
-    (is (= -1 (compare  0  1)))
-    (is (= -1 (compare -1  1)))
-    (is (=  0 (compare  1  1)))
-    (is (=  1 (compare  1  0)))
-    (is (=  1 (compare  1 -1)))
-
-    (is (=  0 (compare "cljs" "cljs")))
-    (is (=  0 (compare :cljs :cljs)))
-    (is (=  0 (compare 'cljs 'cljs)))
-    (is (= -1 (compare "a" "b")))
-    (is (= -1 (compare :a :b)))
-    (is (= -1 (compare 'a 'b)))
-    ;; cases involving ns
-    (is (= -1 (compare :b/a :c/a)))
-    (is (= -1 (compare :c :a/b)))
-    (is (=  1 (compare :a/b :c)))
-    (is (= -1 (compare 'b/a 'c/a)))
-    (is (= -1 (compare 'c 'a/b)))
-    (is (=  1 (compare 'a/b 'c)))
-
-    ;; This is different from clj. clj gives -2 next 3 tests
-    (is (= -1 (compare "a" "c")))
-    (is (= -1 (compare :a :c)))
-    (is (= -1 (compare 'a 'c)))
-
-    (is (= -1 (compare [1 2] [1 1 1])))
-    (is (= -1 (compare [1 2] [1 2 1])))
-    (is (= -1 (compare [1 1] [1 2])))
-    (is (=  0 (compare [1 2] [1 2])))
-    (is (=  1 (compare [1 2] [1 1])))
-    (is (=  1 (compare [1 1 1] [1 2])))
-    (is (=  1 (compare [1 1 2] [1 1 1])))
-    (is (=  0 (compare [] [])))
-    (is (=  0 (compare (vec #js []) [])))
-    (is (=  0 (compare (with-meta [] {}) [])))
-    (is (=  0 (compare (pop [1]) [])))
-
-    (is (= -1 (compare (subvec [1 2 3] 1) (subvec [1 2 4] 1))))
-    (is (=  0 (compare (subvec [1 2 3] 1) (subvec [1 2 3] 1))))
-    (is (=  1 (compare (subvec [1 2 4] 1) (subvec [1 2 3] 1))))
-    (is (=  0 (compare (subvec [1] 0 0) (subvec [2] 0 0))))
-
-    (is (=  0 (compare (js/Date. 2015 2 8 19 13 00 999)
-                       (js/Date. 2015 2 8 19 13 00 999))))
-    (is (= -1 (compare (js/Date. 2015 2 8 19 12 00 999)
-                       (js/Date. 2015 2 8 19 13 00 999))))
-    (is (=  1 (compare (js/Date. 2015 2 8 19 14 00 999)
-                       (js/Date. 2015 2 8 19 13 00 999))))
-  ))
-
-(deftest test-dot
-  (let [s "abc"]
-   (testing "Testing dot operations"
-     (is (= 3 (.-length s)))
-     (is (= 3 (. s -length)))
-     (is (= 3 (. (str 138) -length)))
-     (is (= 3 (. "abc" -length)))
-     (is (= "bc" (.substring s 1)))
-     (is (= "bc" (.substring "abc" 1)))
-     (is (= "bc" ((memfn substring start) s 1)))
-     (is (= "bc" (. s substring 1)))
-     (is (= "bc" (. s (substring 1))))
-     (is (= "bc" (. s (substring 1 3))))
-     (is (= "bc" (.substring s 1 3)))
-     (is (= "ABC" (. s (toUpperCase))))
-     (is (= "ABC" (. "abc" (toUpperCase))))
-     (is (= "ABC" ((memfn toUpperCase) s)))
-     (is (= "BC" (. (. s (toUpperCase)) substring 1)))
-     (is (= 2 (.-length (. (. s (toUpperCase)) substring 1))))
-     )))
-
 (defrecord Person [firstname lastname])
 (defrecord A [])
 (defrecord C [a b c])

src/test/cljs/cljs/destructuring_test.cljs

@@ -0,0 +1,85 @@
+;   Copyright (c) Rich Hickey. All rights reserved.
+;   The use and distribution terms for this software are covered by the
+;   Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;   which can be found in the file epl-v10.html at the root of this distribution.
+;   By using this software in any fashion, you are agreeing to be bound by
+;   the terms of this license.
+;   You must not remove this notice, or any other, from this software.
+
+(ns cljs.destructuring-test
+  (:refer-clojure :exclude [iter])
+  (:require [cljs.test :refer-macros [deftest testing is]]
+            [clojure.string :as s]
+            [clojure.set :as set]))
+
+(deftest test-destructuring
+  (testing "Testing destructuring"
+    (is (= [2 1] (let [[a b] [1 2]] [b a])))
+    (is (= #{1 2} (let [[a b] [1 2]] #{a b})))
+    (is (= [1 2] (let [{a :a b :b} {:a 1 :b 2}] [a b])))
+    (is (= [1 2] (let [{:keys [a b]} {:a 1 :b 2}] [a b])))
+    (is (= [1 2 [1 2]] (let [[a b :as v] [1 2]] [a b v])))
+    (is (= [1 42] (let [{:keys [a b] :or {b 42}} {:a 1}] [a b])))
+    (is (= [1 nil] (let [{:keys [a b] :or {c 42}} {:a 1}] [a b])))
+    (is (= [2 1] (let [[a b] '(1 2)] [b a])))
+    (is (= {1 2} (let [[a b] [1 2]] {a b})))
+    (is (= [2 1] (let [[a b] (seq [1 2])] [b a])))
+    (testing "namespaced keys"
+      (let [{:keys [:a :b]} {:a 1 :b 2}]
+        (testing "basic"
+          (is (= 1 a))
+          (is (= 2 b))))
+      (let [{:keys [:a/b :c/d]} {:a/b 1 :c/d 2}]
+        (testing "keyword syntax"
+          (is (= 1 b))
+          (is (= 2 d))))
+      (let [{:keys [a/b c/d]} {:a/b 1 :c/d 2}]
+        (testing "symbol syntax"
+          (is (= 1 b))
+          (is (= 2 d))))
+      (let [{:syms [a/b c/d]} {'a/b 1 'c/d 2}]
+        (testing ":syms"
+          (is (= 1 b))
+          (is (= 2 d))))
+      (let [{:keys [::s/x ::s/y]} {:clojure.string/x 1 :clojure.string/y 2}]
+        (testing ":keys"
+          (is (= x 1))
+          (is (= y 2))))
+      )))
+
+(deftest keywords-in-destructuring
+  (let [m {:a 1 :b 2}]
+    (let [{:keys [:a :b]} m]
+      (is (= [1 2] [a b])))
+    (let [{:keys [:a :b :c] :or {c 3}} m]
+      (is (= [1 2 3] [a b c])))))
+
+(deftest namespaced-keywords-in-destructuring
+  (let [m {:a/b 1 :c/d 2}]
+    (let [{:keys [:a/b :c/d]} m]
+      (is (= [1 2] [b d])))
+    (let [{:keys [:a/b :c/d :e/f] :or {f 3}} m]
+      (is (= [1 2 3] [b d f])))))
+
+(deftest namespaced-keys-in-destructuring
+  (let [m {:a/b 1 :c/d 2}]
+    (let [{:keys [a/b c/d]} m]
+      (is (= [1 2] [b d])))
+    (let [{:keys [a/b c/d e/f] :or {f 3}} m]
+      (is (= [1 2 3] [b d f])))))
+
+(deftest namespaced-syms-in-destructuring
+  (let [{:syms [a/b c/d e/f] :or {f 3}} {'a/b 1 'c/d 2}]
+    (is (= [1 2 3] [b d f]))))
+
+(deftest namespaced-keys-syntax
+  (let [{:a/keys [b c d] :or {d 3}} {:a/b 1 :a/c 2}]
+    (is (= [1 2 3] [b c d]))))
+
+(deftest namespaced-syms-syntax
+  (let [{:a/syms [b c d] :or {d 3}} {'a/b 1 'a/c 2}]
+    (is (= [1 2 3] [b c d]))))
+
+(deftest resolve-keyword-ns-alias-in-destructuring
+  (let [{:keys [::s/x ::s/y ::s/z] :or {z 3}} {:clojure.string/x 1 :clojure.string/y 2}]
+    (is (= [1 2 3] [x y z]))))