1 files changed, 271 insertions, 260 deletions
diff --git a/core_test.fnl b/core_test.fnl
index 6c3ba6c..38ce135 100644
--- a/core_test.fnl
+++ b/core_test.fnl
@@ -1,6 +1,6 @@
 (import-macros {: fn*} :macros.fn)
 (import-macros {: into} :macros.core)
-(import-macros {: assert-eq : assert-ne : assert* : test} :test)
+(import-macros {: assert-eq : assert-ne : assert* : testing : deftest} :test)
 
 (local
  {: apply
@@ -39,269 +39,280 @@
   : range
   : reverse
   : inc
-  : dec
-  }
+  : dec}
  (require :core))
 
-(test eq?
-  ;; comparing basetypes
-  (assert-eq 1 1)
-  (assert-ne 1 2)
-  (assert* (eq? 1 1 1 1 1))
-  (assert-eq 1.0 1.0)
-  (assert* (eq? 1.0 1.0 1.0))
-  (assert* (eq? 1.0 1.0 1.0))
-  (assert* (eq? "1" "1" "1" "1" "1"))
-
-  ;; deep comparison
-  (assert* (eq? []))
-  (assert-eq [] [])
-  (assert-eq [] {})
-  (assert-eq [1 2] [1 2])
-  (assert-ne [1] [1 2])
-  (assert-ne [1 2] [1])
-  (assert* (eq? [1 [2]] [1 [2]] [1 [2]]))
-  (assert* (eq? [1 [2]] [1 [2]] [1 [2]]))
-  (assert* (not (eq? [1 [2]] [1 [2]] [1 [2 [3]]])))
-
-  (let [a {:a 1 :b 2}
-        b {:a 1 :b 2}]
-    (table.insert b 10)
-    (assert-ne a b))
-
-  (let [a [1 2 3]
-        b [1 2 3]]
-    (tset b :a 10)
-    (assert-ne a b))
-
-  (assert-eq [1 2 3] {1 1 2 2 3 3})
-
-  ;; TODO: decide if this is right or not.  Looking from `seq'
-  ;; perspective, it is correct, as `(seq {4 1})' and `(seq [nil nil
-  ;; nil 1])' both yield `{4 1}'.  From Lua's point this is not the
-  ;; same thing, for example because the sizes of these tables are
-  ;; different.
-  (assert-eq {4 1} [nil nil nil 1]))
-
-(test range
+(deftest equality
+  (testing eq?
+    ;; comparing basetypes
+    (assert-eq 1 1)
+    (assert-ne 1 2)
+    (assert* (eq? 1 1 1 1 1))
+    (assert-eq 1.0 1.0)
+    (assert* (eq? 1.0 1.0 1.0))
+    (assert* (eq? 1.0 1.0 1.0))
+    (assert* (eq? "1" "1" "1" "1" "1"))
+
+    ;; deep comparison
+    (assert* (eq? []))
+    (assert-eq [] [])
+    (assert-eq [] {})
+    (assert-eq [1 2] [1 2])
+    (assert-ne [1] [1 2])
+    (assert-ne [1 2] [1])
+    (assert* (eq? [1 [2]] [1 [2]] [1 [2]]))
+    (assert* (eq? [1 [2]] [1 [2]] [1 [2]]))
+    (assert* (not (eq? [1 [2]] [1 [2]] [1 [2 [3]]])))
+
+    (let [a {:a 1 :b 2}
+          b {:a 1 :b 2}]
+      (table.insert b 10)
+      (assert-ne a b))
+
+    (let [a [1 2 3]
+          b [1 2 3]]
+      (tset b :a 10)
+      (assert-ne a b))
+
+    (assert-eq [1 2 3] {1 1 2 2 3 3})
+
+    ;; TODO: decide if this is right or not.  Looking from `seq'
+    ;; perspective, it is correct, as `(seq {4 1})' and `(seq [nil nil
+    ;; nil 1])' both yield `{4 1}'.  From Lua's point this is not the
+    ;; same thing, for example because the sizes of these tables are
+    ;; different.
+    (assert-eq {4 1} [nil nil nil 1])))
+
+(testing range
   (assert-eq (range 10) [0 1 2 3 4 5 6 7 8 9])
   (assert-eq (range -5 5) [-5 -4 -3 -2 -1 0 1 2 3 4])
   (assert-eq [0 0.2 0.4 0.6 0.8] [0 0.2 0.4 0.6 0.8])
   (assert-eq (range 0 1 0.2) (range 0 1 0.2)))
 
-(test seq
-  (assert-eq (seq []) nil)
-  (assert-eq (seq {}) nil)
-  (assert-eq (seq [1]) [1])
-  (assert-eq (seq [1 2 3]) [1 2 3])
-  (assert-eq (seq {:a 1}) [["a" 1]]))
-
-(test mapv
-  (assert-eq (mapv #(* $ $) [1 2 3 4]) [1 4 9 16])
-
-  (assert-eq (into {} (mapv (fn [[k v]] [k (* v v)]) {:a 1 :b 2 :c 3}))
-             (into {} [[:a 1] [:b 4] [:c 9]]))
-
-  (assert-eq (into {} (mapv (fn [[k1 v1] [k2 v2]] [k1 (* v1 v2)])
-                            {:a 1 :b 2 :c 3}
-                            {:a -1 :b 0 :c 2}))
-             {:a -1 :b 0 :c 6})
-  (assert-eq (mapv string.upper ["a" "b" "c"]) ["A" "B" "C"])
-  (assert-eq (mapv #(+ $1 $2 $3 $4) [1 -1] [2 -2] [3 -3] [4 -4]) [(+ 1 2 3 4) (+ -1 -2 -3 -4)])
-  (assert-eq (mapv (fn [f-name s-name company position]
-                     (.. f-name " " s-name " works as " position " at " company))
-                   ["Bob" "Alice"]
-                   ["Smith" "Watson"]
-                   ["Happy Days co." "Coffee With You"]
-                   ["secretary" "chief officer"])
-             ["Bob Smith works as secretary at Happy Days co."
-              "Alice Watson works as chief officer at Coffee With You"]))
-
-(test reduce
-  (fn* plus
-    ([] 0)
-    ([a] a)
-    ([a b] (+ a b))
-    ([a b & c]
-     (var res (+ a b))
-     (each [_ v (ipairs c)]
-       (set res (+ res v)))
-     res))
-
-  (assert-eq (reduce plus (range 10)) 45)
-  (assert-eq (reduce plus -3 (range 10)) 42)
-  (assert-eq (reduce plus 10 nil) 10)
-
-
-  (fn mapping [f]
-    (fn [reducing]
-      (fn [result input]
-        (reducing result (f input)))))
-
-  (fn reduce- [f init tbl]
-    (if (and tbl (> (length tbl) 0))
-        (reduce f (f init (first tbl)) (rest tbl))
-        init))
-
-  (assert-eq (reduce plus (range 10)) (reduce- plus 0 (range 10))))
-
-;; test predicates:
-
-(test zero?
-  (assert* (zero? 0))
-  (assert* (zero? -0))
-  (assert* (not (zero? 1))))
-
-(test int?
-  (assert* (int? 1))
-  (assert* (not (int? 1.1))))
-
-(test pos?
-  (assert* (pos? 1))
-  (assert* (and (not (pos? 0)) (not (pos? -1)))))
-
-(test neg?
-  (assert* (neg? -1))
-  (assert* (and (not (neg? 0)) (not (neg? 1)))))
-
-(test pos-int?
-  (assert* (pos-int? 42))
-  (assert* (not (pos-int? 4.2))))
-
-(test neg-int?
-  (assert* (neg-int? -42))
-  (assert* (not (neg-int? -4.2))))
-
-(test string?
-  (assert* (string? :s)))
-
-(test double?
-  (assert* (double? 3.3))
-  (assert* (not (double? 3.0))))
-
-(test map?
-  (assert* (map? {:a 1}))
-  (assert* (not (map? {}))))
-
-(test seq?
-  (assert* (not (seq? [])))
-  (assert* (seq? [{:a 1}]))
-  (assert* (not (seq? {})))
-  (assert* (not (seq? {:a 1}))))
-
-(test nil?
-  (assert* (nil?))
-  (assert* (nil? nil))
-  (assert* (not (nil? 1))))
-
-(test odd?
-  (assert* (odd? 3))
-  (assert* (odd? -3))
-  (assert* (not (odd? 2)))
-  (assert* (not (odd? -2))))
-
-(test even?
-  (assert* (even? 2))
-  (assert* (even? -2))
-  (assert* (not (even? 23)))
-  (assert* (not (even? -23))))
-
-(test filter
-  (assert-eq (filter even? (range 10)) [0 2 4 6 8])
-  (assert-eq (filter odd? (range 10)) [1 3 5 7 9])
-  (assert-eq (filter map? [{:a 1} {5 1} [1 2] [] {}]) [{:a 1} {5 1}])
-  (assert-eq (filter seq? [{:a 1} {5 1} [1 2] [] {}]) [[1 2]]))
-
-(test concat
-  (assert-eq (concat) nil)
-  (assert-eq (concat []) [])
-  (assert-eq (concat [1 2 3]) [1 2 3])
-  (assert-eq (concat [1 2 3] [4 5 6]) [1 2 3 4 5 6])
-  (assert-eq (concat [1 2] [3 4] [5 6]) [1 2 3 4 5 6])
-  (assert-eq (concat {:a 1} {:b 2}) [[:a 1] [:b 2]]))
-
-(test reverse
-  (assert-eq (reverse [1 2 3]) [3 2 1])
-  (assert-eq (reverse {:a 1}) [[:a 1]]))
-
-(test constantly
-  (let [always-nil (constantly nil)]
-    (assert-eq (always-nil) nil)
-    (assert-eq (always-nil 1) nil)
-    (assert-eq (always-nil 1 2 3 4 "5") nil))
-
-  (let [always-true (constantly true)]
-    (assert* (always-true))
-    (assert* (always-true false))))
-
-(test complement
-  (assert* ((complement nil?) 10)))
-
-(test some
-  (assert* (some pos-int? [-1 1.1 2.3 -5.5 42 10 -27]))
-  (assert* (not (some pos-int? {:a 1})))
-  (assert* (some pos-int? [{:a 1} "1" -1 1])))
-
-(test every?
-  (assert* (not (every? pos-int? [-1 1.1 2.3 -5.5 42 10 -27])))
-  (assert* (not (every? pos-int? {:a 1})))
-  (assert* (every? pos-int? [1 2 3 4 5])))
-
-(test identity
-  (assert-eq (identity 1) 1)
-  (assert-eq (identity {:a 1 :b 2}) {:a 1 :b 2})
-  (assert-eq (identity [1 2 3]) [1 2 3])
-  (assert-eq (identity "abc") "abc"))
-
-(test empty?
-  (assert* (empty? []))
-  (assert* (empty? {}))
-  (assert* (empty? ""))
-  (assert* (not (empty? "1")))
-  (assert* (not (empty? [1])))
-  (assert* (not (empty? {:a 1}))))
-
-(test not-empty
-  (assert-eq (not-empty []) nil)
-  (assert-eq (not-empty {}) nil)
-  (assert-eq (not-empty "") nil)
-  (assert-eq (not-empty "1") "1")
-  (assert-eq (not-empty [1]) [1])
-  (assert-eq (not-empty {:a 1}) {:a 1}))
-
-(test apply
-  (fn* add
-    ([x] x)
-    ([x y] (+ x y))
-    ([x y & zs]
-     (add (+ x y) ((or _G.unpack table.unpack) zs))))
-  (assert-eq (apply add [1 2 3 4]) 10)
-  (assert-eq (apply add -1 [1 2 3 4]) 9)
-  (assert-eq (apply add -2 -1 [1 2 3 4]) 7)
-  (assert-eq (apply add -3 -2 -1 [1 2 3 4]) 4)
-  (assert-eq (apply add -4 -3 -2 -1 [1 2 3 4]) 0))
-
-(test conj
-  (assert-eq (conj [] 1 2 3) [1 2 3])
-  (assert-eq (conj [0] 1 2 3) [0 1 2 3])
-  (assert-eq (conj {:a 1} [:b 2]) {:a 1 :b 2}))
-
-(test cons
-  (assert-eq (cons 1 []) [1])
-  (assert-eq (cons 1 [0]) [1 0]))
-
-(test first
-  (assert-eq (first [1 2 3]) 1)
-  (assert-eq (first {:a 1}) [:a 1]))
-
-(test rest
-  (assert-eq (rest [1 2 3]) [2 3])
-  (assert-eq (rest {:a 1}) []))
-
-(test reduce-kv
-  (assert-eq (reduce-kv #(+ $1 $3) 0 {:a 1 :b 2 :c 3}) 6))
-
-(test comp
-  (fn square [x] (* x x))
-  (assert-eq ((comp square inc) 6) 49)
-  (assert-eq ((comp #(- $ 7) square inc inc inc inc inc inc inc) 0) 42))
+(deftest predicates
+  (testing zero?
+    (assert* (zero? 0))
+    (assert* (zero? -0))
+    (assert* (not (zero? 1))))
+
+  (testing int?
+    (assert* (int? 1))
+    (assert* (not (int? 1.1))))
+
+  (testing pos?
+    (assert* (pos? 1))
+    (assert* (and (not (pos? 0)) (not (pos? -1)))))
+
+  (testing neg?
+    (assert* (neg? -1))
+    (assert* (and (not (neg? 0)) (not (neg? 1)))))
+
+  (testing pos-int?
+    (assert* (pos-int? 42))
+    (assert* (not (pos-int? 4.2))))
+
+  (testing neg-int?
+    (assert* (neg-int? -42))
+    (assert* (not (neg-int? -4.2))))
+
+  (testing string?
+    (assert* (string? :s)))
+
+  (testing double?
+    (assert* (double? 3.3))
+    (assert* (not (double? 3.0))))
+
+  (testing map?
+    (assert* (map? {:a 1}))
+    (assert* (not (map? {}))))
+
+  (testing seq?
+    (assert* (not (seq? [])))
+    (assert* (seq? [{:a 1}]))
+    (assert* (not (seq? {})))
+    (assert* (not (seq? {:a 1}))))
+
+  (testing nil?
+    (assert* (nil?))
+    (assert* (nil? nil))
+    (assert* (not (nil? 1))))
+
+  (testing odd?
+    (assert* (odd? 3))
+    (assert* (odd? -3))
+    (assert* (not (odd? 2)))
+    (assert* (not (odd? -2))))
+
+  (testing even?
+    (assert* (even? 2))
+    (assert* (even? -2))
+    (assert* (not (even? 23)))
+    (assert* (not (even? -23)))))
+
+(deftest sequence-functions
+  (testing seq
+    (assert-eq (seq []) nil)
+    (assert-eq (seq {}) nil)
+    (assert-eq (seq [1]) [1])
+    (assert-eq (seq [1 2 3]) [1 2 3])
+    (assert-eq (seq {:a 1}) [["a" 1]]))
+
+  (testing mapv
+    (assert-eq (mapv #(* $ $) [1 2 3 4]) [1 4 9 16])
+
+    (assert-eq (into {} (mapv (fn [[k v]] [k (* v v)]) {:a 1 :b 2 :c 3}))
+               (into {} [[:a 1] [:b 4] [:c 9]]))
+
+    (assert-eq (into {} (mapv (fn [[k1 v1] [k2 v2]] [k1 (* v1 v2)])
+                              {:a 1 :b 2 :c 3}
+                              {:a -1 :b 0 :c 2}))
+               {:a -1 :b 0 :c 6})
+    (assert-eq (mapv string.upper ["a" "b" "c"]) ["A" "B" "C"])
+    (assert-eq (mapv #(+ $1 $2 $3 $4) [1 -1] [2 -2] [3 -3] [4 -4]) [(+ 1 2 3 4) (+ -1 -2 -3 -4)])
+    (assert-eq (mapv (fn [f-name s-name company position]
+                       (.. f-name " " s-name " works as " position " at " company))
+                     ["Bob" "Alice"]
+                     ["Smith" "Watson"]
+                     ["Happy Days co." "Coffee With You"]
+                     ["secretary" "chief officer"])
+               ["Bob Smith works as secretary at Happy Days co."
+                "Alice Watson works as chief officer at Coffee With You"]))
+
+  (testing reduce
+    (fn* plus
+      ([] 0)
+      ([a] a)
+      ([a b] (+ a b))
+      ([a b & c]
+       (var res (+ a b))
+       (each [_ v (ipairs c)]
+         (set res (+ res v)))
+       res))
+
+    (assert-eq (reduce plus (range 10)) 45)
+    (assert-eq (reduce plus -3 (range 10)) 42)
+    (assert-eq (reduce plus 10 nil) 10)
+
+    (fn mapping [f]
+      (fn [reducing]
+        (fn [result input]
+          (reducing result (f input)))))
+
+    (fn reduce- [f init tbl]
+      (if (and tbl (> (length tbl) 0))
+          (reduce f (f init (first tbl)) (rest tbl))
+          init))
+
+    (assert-eq (reduce plus (range 10)) (reduce- plus 0 (range 10))))
+
+  (testing filter
+    (assert-eq (filter even? (range 10)) [0 2 4 6 8])
+    (assert-eq (filter odd? (range 10)) [1 3 5 7 9])
+    (assert-eq (filter map? [{:a 1} {5 1} [1 2] [] {}]) [{:a 1} {5 1}])
+    (assert-eq (filter seq? [{:a 1} {5 1} [1 2] [] {}]) [[1 2]]))
+
+  (testing concat
+    (assert-eq (concat) nil)
+    (assert-eq (concat []) [])
+    (assert-eq (concat [1 2 3]) [1 2 3])
+    (assert-eq (concat [1 2 3] [4 5 6]) [1 2 3 4 5 6])
+    (assert-eq (concat [1 2] [3 4] [5 6]) [1 2 3 4 5 6])
+    (assert-eq (concat {:a 1} {:b 2}) [[:a 1] [:b 2]]))
+
+  (testing reverse
+    (assert-eq (reverse [1 2 3]) [3 2 1])
+    (assert-eq (reverse {:a 1}) [[:a 1]]))
+
+  (testing conj
+    (assert-eq (conj [] 1 2 3) [1 2 3])
+    (assert-eq (conj [0] 1 2 3) [0 1 2 3])
+    (assert-eq (conj {:a 1} [:b 2]) {:a 1 :b 2}))
+
+  (testing cons
+    (assert-eq (cons 1 []) [1])
+    (assert-eq (cons 1 [0]) [1 0]))
+
+  (testing first
+    (assert-eq (first [1 2 3]) 1)
+    (assert-eq (first {:a 1}) [:a 1]))
+
+  (testing rest
+    (assert-eq (rest [1 2 3]) [2 3])
+    (assert-eq (rest {:a 1}) []))
+
+  (testing reduce-kv
+    (assert-eq (reduce-kv #(+ $1 $3) 0 {:a 1 :b 2 :c 3}) 6)))
+
+(deftest function-manipulation
+  (testing constantly
+    (let [always-nil (constantly nil)]
+      (assert-eq (always-nil) nil)
+      (assert-eq (always-nil 1) nil)
+      (assert-eq (always-nil 1 2 3 4 "5") nil))
+
+    (let [always-true (constantly true)]
+      (assert* (always-true))
+      (assert* (always-true false))))
+
+  (testing complement
+    (assert* ((complement nil?) 10)))
+
+  (testing apply
+    (fn* add
+      ([x] x)
+      ([x y] (+ x y))
+      ([x y & zs]
+       (add (+ x y) ((or _G.unpack table.unpack) zs))))
+    (assert-eq (apply add [1 2 3 4]) 10)
+    (assert-eq (apply add -1 [1 2 3 4]) 9)
+    (assert-eq (apply add -2 -1 [1 2 3 4]) 7)
+    (assert-eq (apply add -3 -2 -1 [1 2 3 4]) 4)
+    (assert-eq (apply add -4 -3 -2 -1 [1 2 3 4]) 0))
+
+  (testing comp
+    (fn square [x] (* x x))
+    (assert-eq ((comp square inc) 6) 49)
+    (assert-eq ((comp #(- $ 7) square inc inc inc inc inc inc inc) 0) 42))
+
+  (testing identity
+    (fn f [] nil)
+    (assert-eq (identity 1) 1)
+    (assert-eq (identity {:a 1 :b 2}) {:a 1 :b 2})
+    (assert-eq (identity [1 2 3]) [1 2 3])
+    (assert-eq (identity "abc") "abc")
+    (assert-eq (identity f) f)))
+
+(deftest sequence-predicates
+  (testing some
+    (assert* (some pos-int? [-1 1.1 2.3 -5.5 42 10 -27]))
+    (assert* (not (some pos-int? {:a 1})))
+    (assert* (some pos-int? [{:a 1} "1" -1 1])))
+
+  (testing every?
+    (assert* (not (every? pos-int? [-1 1.1 2.3 -5.5 42 10 -27])))
+    (assert* (not (every? pos-int? {:a 1})))
+    (assert* (every? pos-int? [1 2 3 4 5])))
+
+  (testing empty?
+    (assert* (empty? []))
+    (assert* (empty? {}))
+    (assert* (empty? ""))
+    (assert* (not (empty? "1")))
+    (assert* (not (empty? [1])))
+    (assert* (not (empty? {:a 1}))))
+
+  (testing not-empty
+    (assert-eq (not-empty []) nil)
+    (assert-eq (not-empty {}) nil)
+    (assert-eq (not-empty "") nil)
+    (assert-eq (not-empty "1") "1")
+    (assert-eq (not-empty [1]) [1])
+    (assert-eq (not-empty {:a 1}) {:a 1})))
+
+(deftest math-functions
+  (testing inc
+    (assert-eq (inc 1) 2)
+    (assert-eq (inc -1) 0))
+  (testing dec
+    (assert-eq (dec 1) 0)
+    (assert-eq (dec -1) -2)))