Changed expectations in tests to match the slight functional changes

addisonj · Jul 23, 2014 · 7db087a · 7db087a
1 parent 43dcf74
commit 7db087a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/test/org/spootnik/cyanite/carbon_test.clj b/test/org/spootnik/cyanite/carbon_test.clj
@@ -4,8 +4,8 @@
             [clojure.test                :refer :all]))
 
 (deftest formatter-test
-  (testing "nil-transform"
-    (is (= nil (formatter nil [] "foo nan 501"))))
+  (testing "empty-transform"
+    (is (= '() (formatter [] "foo nan 501"))))
 
   (testing "rollup-transform"
     (is (= (list {:path "foo.bar"
@@ -14,7 +14,7 @@
                   :ttl    36000
                   :time   500
                   :metric 2.0})
-           (formatter nil
+           (formatter
                       (assoc-rollup-to  [{:rollup 10 :period 3600}])
                       "foo.bar 2.0 501")))
 
@@ -30,7 +30,7 @@
                   :ttl    432000
                   :time   600
                   :metric 2.0})
-           (formatter nil
+           (formatter
                       (assoc-rollup-to  [{:rollup 10 :period 3600}
                                          {:rollup 60 :period 7200}])
                       "foo.bar 2.0 601")))

diff --git a/test/org/spootnik/cyanite/config_test.clj b/test/org/spootnik/cyanite/config_test.clj
@@ -31,4 +31,5 @@
 
   (testing "15s:6h is converted correctly"
     (is (= {:rollup 15
-            :period 1440} (convert-shorthand-rollup "15s:6h")))))
+            :period 1440
+            :ttl 21600} (convert-shorthand-rollup "15s:6h")))))