Merge pull request #14 from shopsmart/pre-1.0

Minor bugfix; more tests

Author: coconutpalm

project.clj

@@ -1,4 +1,4 @@
-(defproject com.github.shopsmart/clj-foundation "0.9.14"
+(defproject com.github.shopsmart/clj-foundation "0.9.15"
   :description "Common patterns enabling simpler to be easier and harder to be possibler."
   :url "https://github.com/shopsmart/clj-foundation"
 

src/clj_foundation/data.clj

@@ -35,15 +35,17 @@
 
   ([value :- s/Any, predicate :- (=> s/Any [s/Any]), replacement :- s/Any]
    (if (predicate value)
-     value
-     replacement)))
+     replacement
+     value)))
 
 
 (s/defn replace-nil :- s/Any
   "Accepts a value that cannot be nil; if it is not nil it returns it, else it
   returns its replacement."
   [maybe-nil :- s/Any, replacement :- s/Any]
-  (replace-if maybe-nil #{nil} replacement))
+  (if (nil? maybe-nil)
+    replacement
+    maybe-nil))
 
 
 (s/defn nothing->identity :- s/Any

test/clj_foundation/data_test.clj

@@ -9,6 +9,49 @@
 
 (common/register-fixtures)
 
+
+(deftest any?-test
+  (testing "One element, no match"
+    (is (not (any? even? [1]))))
+
+  (testing "One element, matches"
+    (is (= [2] (any? even? [2]))))
+
+  (testing "Two elements, no match"
+    (is (nil? (any? even? [1 3]))))
+
+  (testing "Two elements, second matches"
+    (is (any? even? [1 4])))
+
+  (testing "Five elements, no match"
+    (is (nil? (any? even? [1 3 5 7 9]))))
+
+  (testing "Five elements, second-to-last matches"
+    (is (any? even? [1 3 5 8 9])))
+
+  (testing "Five elements, multiple matches"
+    (is (any? even? [1 10 5 8 9]))))
+
+
+(deftest replace-if-test
+  (testing "binary form"
+    (is (= ""            (replace-if "replacement" (constantly ""))))
+    (is (= "replacement" (replace-if "replacement" (constantly false)))))
+
+  (testing "terniary form - replace"
+    (is (= "replacement" (replace-if "foo" #{"foo" "bar" "baz"} "replacement")))
+    (is (= "replacement" (replace-if nil #(nil? %) "replacement"))))
+
+  (testing "terniary form - do not replace"
+    (is (= "original" (replace-if "original" #{"New!"} "replacement")))
+    (is (= "original" (replace-if "original" (constantly false) "replacement")))))
+
+
+(deftest replace-nil-test
+  (is (= "" (replace-nil nil "")))
+  (is (= "data" (replace-nil "data" ""))))
+
+
 (deftest identity->nil-test
   (testing "Numbers use zero? as their default identity predicate"
     (is (nil?                (identity->nil 0)))
@@ -58,4 +101,4 @@
     (is (= :nested.property-name (keywordize "nested.propertyName")))))
 
 
-#_(run-tests)
+(run-tests)

test/clj_foundation/errors_test.clj

@@ -42,6 +42,34 @@
     (is (not (failure? (Object.))))))
 
 
+(let [e1    (Exception. "Just one")
+
+      e2'   (Exception. "I'm guilty.")
+      e2    (Exception. "An exception with a cause." e2')
+
+      e3''  (Exception. "only table or database owner can vacuum it")
+      e3'   (Exception. "Look deeper" e3'')
+      e3    (Exception. "An exception with a fatal cause." e3')
+
+      e4''' (Exception. "Lotssss offff causses, my Preciousss!")
+      e4''  (Exception. "only table or database owner can vacuum it" e4''')
+      e4'   (Exception. "Look deeper" e4'')
+      e4    (Exception. "An exception with a fatal cause." e4')
+
+      e5    (ex-info "Master exception" {} e4)]
+
+  (deftest seq<-test
+    (testing "One exception with no cause returns a list of that exception only"
+      (is (= "Just one" (.getMessage (first (seq<- e1)))))
+      (is (= 1 (count (seq<- e1)))))
+
+    (testing "Nested exceptions add items to the exception list"
+      (is (= 2 (count (seq<- e2))))
+      (is (= 3 (count (seq<- e3)))))
+
+    (testing "ex-info :via maps are parsed"
+      (is (= 5 (count (seq<- e5)))))))
+
 
 (deftest retry?-test
   (testing "Retry up to :max-retries times"