Add test for status-codes & replace reduce with O(1) lookup

Author: joelittlejohn

src/clj_http_hystrix/core.clj

@@ -65,14 +65,15 @@
       (warn message))))
 
 (defn status-codes
-  "Create a predicate that returns true whenever one of the given 
+  "Create a predicate that returns true whenever one of the given
   status codes is present"
-  [& status]
-  (fn [req resp]
-    (reduce #(or %1 (= %2 (:status resp))) false status)))
+  [& status-codes]
+  (let [status-codes (set status-codes)]
+    (fn [req resp]
+      (contains? status-codes (:status resp)))))
 
 (defn client-error?
-  "Returns true when the response has one of the 4xx family of status 
+  "Returns true when the response has one of the 4xx family of status
   codes"
   [req resp]
   (http/client-error? resp))

test/clj_http_hystrix/core_test.clj

@@ -126,7 +126,7 @@
            (http/get url {:throw-exceptions false
                           :hystrix/command-key command-key
                           :hystrix/bad-request-pred client-error?}) => (contains {:status 400}))
-         (Thread/sleep 1000) ;sleep to wait for Hystrix health snapshot
+         (Thread/sleep 600) ;sleep to wait for Hystrix health snapshot
          (http/get url {:throw-exceptions false
                         :hystrix/command-key command-key}) => (contains {:status 200}))))
 
@@ -144,7 +144,7 @@
            (http/get url {:throw-exceptions true
                           :hystrix/command-key command-key
                           :hystrix/bad-request-pred client-error?}) => (throws ExceptionInfo))
-         (Thread/sleep 1000) ;sleep to wait for Hystrix health snapshot
+         (Thread/sleep 600) ;sleep to wait for Hystrix health snapshot
          (http/get url {:throw-exceptions false
                         :hystrix/command-key command-key}) => (contains {:status 200}))))
 
@@ -159,6 +159,15 @@
            (http/get url {:throw-exceptions false
                           :hystrix/command-key command-key
                           :hystrix/bad-request-pred (constantly false)}) => (contains {:status 400}))
-         (Thread/sleep 1000) ;sleep to wait for Hystrix health snapshot
+         (Thread/sleep 600) ;sleep to wait for Hystrix health snapshot
          (http/get url {:throw-exceptions false
                         :hystrix/command-key command-key}) => (contains {:status 503}))))
+
+(fact "status-codes predicate matches only given status codes"
+      (let [predicate (status-codes 100 200 300)]
+        (predicate {} {:status 100}) => true
+        (predicate {} {:status 200}) => true
+        (predicate {} {:status 300}) => true
+        (predicate {} {:status 101}) => false
+        (predicate {} {:status 202}) => false
+        (predicate {} {:status 299}) => false))