Split 2i tests into HTTP and PBC, with PBC not being run by default

michaelklishin · Aug 7, 2012 · b69689e · b69689e
1 parent b8e94d5
commit b69689e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -29,6 +29,7 @@
                    :search  :search
                    ;; as in, edge Riak features
                    ::edge-features :edge-features
+                   :default (fn [m] (not (:edge-features m)))
                    :all     (constantly true)}
   :repositories   {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
                                :snapshots false

diff --git a/.../clojurewerkz/welle/test/indices_test.clj → ...urewerkz/welle/test/indices_http_test.clj b/.../clojurewerkz/welle/test/indices_test.clj → ...urewerkz/welle/test/indices_http_test.clj
@@ -1,4 +1,4 @@
-(ns clojurewerkz.welle.test.indices-test
+(ns clojurewerkz.welle.test.indices-http-test
   (:use clojure.test
         [clojurewerkz.welle.testkit :only [drain]]
         [clojure.set :only [subset?]])
@@ -11,7 +11,7 @@
 (wc/connect!)
 
 (deftest ^{:2i true} test-indexes-on-converted-riak-objects
-  (let [bucket-name "clojurewerkz.welle.test.indices-test"
+  (let [bucket-name "clojurewerkz.welle.test.indices-http-test"
         bucket      (wb/update bucket-name)
         k           (str (UUID/randomUUID))
         v           "value"
@@ -25,7 +25,7 @@
 
 
 (deftest ^{:2i true} test-basic-index-query-with-a-single-string-value
-  (let [bucket-name "clojurewerkz.welle.test.indices-test"
+  (let [bucket-name "clojurewerkz.welle.test.indices-http-test"
         bucket      (wb/update bucket-name)
         k           (str (UUID/randomUUID))
         v           (.getBytes "value")
@@ -41,7 +41,7 @@
 
 
 (deftest ^{:2i true} test-basic-index-query-with-a-range-of-string-values
-  (let [bucket-name "clojurewerkz.welle.test.indices-test"
+  (let [bucket-name "clojurewerkz.welle.test.indices-http-test"
         bucket      (wb/update bucket-name)
         k1          (str (UUID/randomUUID))
         k2          (str (UUID/randomUUID))
@@ -74,7 +74,7 @@
 
 
 (deftest ^{:2i true} test-basic-index-query-with-a-range-of-integer-values
-  (let [bucket-name "clojurewerkz.welle.test.indices-test"
+  (let [bucket-name "clojurewerkz.welle.test.indices-http-test"
         bucket      (wb/update bucket-name)
         k1          (str (UUID/randomUUID))
         k2          (str (UUID/randomUUID))

diff --git a/test/clojurewerkz/welle/test/indices_pb_test.clj b/test/clojurewerkz/welle/test/indices_pb_test.clj
@@ -0,0 +1,26 @@
+(ns clojurewerkz.welle.test.indices-pb-test
+  (:use clojure.test
+        [clojurewerkz.welle.testkit :only [drain]]
+        [clojure.set :only [subset?]])
+  (:require [clojurewerkz.welle.core    :as wc]
+            [clojurewerkz.welle.buckets :as wb]
+            [clojurewerkz.welle.kv      :as kv])
+  (:import java.util.UUID
+           com.basho.riak.client.http.util.Constants))
+
+(wc/connect-via-pb!)
+
+(deftest ^{:2i true :edge-features true} test-basic-index-query-with-a-single-string-value-over-pb
+  (let [bucket-name "clojurewerkz.welle.test.indices-pb-test"
+        bucket      (wb/update bucket-name)
+        k           (str (UUID/randomUUID))
+        v           (.getBytes "value")
+        indexes     {:email #{"johndoe@example.com" "timsmith@example.com"}}
+        stored      (kv/store bucket-name k v :indexes indexes :content-type Constants/CTYPE_OCTET_STREAM)
+        [idx-key]   (kv/index-query bucket-name :email "johndoe@example.com")
+        [fetched]   (kv/fetch bucket-name idx-key)]
+    (is (:indexes fetched))
+    (is (= (String. ^bytes (:value fetched))
+           (String. ^bytes v)))
+    (is (= (:indexes fetched) indexes))
+    (kv/delete bucket-name k)))