X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fmemcached%2Fexist.cpp;h=07758150c1c85ac586a329553ecc8f54445709ee;hb=36c2351bfeb343f4d6da922cdee58f4bcdcd7e08;hp=7c89d7d0ae77aab3bfc8248098f5ed0bf32434a3;hpb=a50984cac2e98548fa9188ec81f663b56732ac94;p=awesomized%2Flibmemcached

diff --git a/test/tests/memcached/exist.cpp b/test/tests/memcached/exist.cpp
index 7c89d7d0..07758150 100644
--- a/test/tests/memcached/exist.cpp
+++ b/test/tests/memcached/exist.cpp
@@ -2,45 +2,40 @@
 #include "test/lib/MemcachedCluster.hpp"
 
 TEST_CASE("memcached_exist") {
-  pair<string, MemcachedCluster> tests[]{
-    {"bin_mixed", MemcachedCluster::mixed()},
-    {"network", MemcachedCluster::network()},
-    {"socket", MemcachedCluster::socket()}
-  };
+  MemcachedCluster test;
+  auto memc = &test.memc;
+  auto binary = GENERATE(0, 1);
 
-  tests[0].second.enableBinaryProto();
+  test.enableBinaryProto(binary);
+  INFO("binary: " << binary);
 
-  LOOPED_SECTION(tests) {
-    auto memc = &test.memc;
+  SECTION("initial not found") {
+    REQUIRE_RC(MEMCACHED_NOTFOUND,memcached_exist(memc, S("frog")));
+  }
+
+  SECTION("set found") {
+      REQUIRE_SUCCESS(memcached_set(memc, S("frog"), S("frog"), 0, 0));
+      REQUIRE_SUCCESS(memcached_exist(memc, S("frog")));
+
+      SECTION("deleted not found") {
+        REQUIRE_SUCCESS(memcached_delete(memc, S("frog"), 0));
+        REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_exist(memc, S("frog")));
+      }
+  }
 
+  SECTION("by key") {
     SECTION("initial not found") {
-      REQUIRE_RC(MEMCACHED_NOTFOUND,memcached_exist(memc, S("frog")));
+      REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_exist_by_key(memc, S("master"), S("frog")));
     }
 
     SECTION("set found") {
-        REQUIRE_SUCCESS(memcached_set(memc, S("frog"), S("frog"), 0, 0));
-        REQUIRE_SUCCESS(memcached_exist(memc, S("frog")));
+      REQUIRE_SUCCESS(memcached_set_by_key(memc, S("master"), S("frog"), S("frog"), 0, 0));
+      REQUIRE_SUCCESS(memcached_exist_by_key(memc, S("master"), S("frog")));
 
-        SECTION("deleted not found") {
-          REQUIRE_SUCCESS(memcached_delete(memc, S("frog"), 0));
-          REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_exist(memc, S("frog")));
-        }
-    }
-
-    SECTION("by key") {
-      SECTION("initial not found") {
+      SECTION("deleted not found") {
+        REQUIRE_SUCCESS(memcached_delete_by_key(memc, S("master"), S("frog"), 0));
         REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_exist_by_key(memc, S("master"), S("frog")));
       }
-
-      SECTION("set found") {
-        REQUIRE_SUCCESS(memcached_set_by_key(memc, S("master"), S("frog"), S("frog"), 0, 0));
-        REQUIRE_SUCCESS(memcached_exist_by_key(memc, S("master"), S("frog")));
-
-        SECTION("deleted not found") {
-          REQUIRE_SUCCESS(memcached_delete_by_key(memc, S("master"), S("frog"), 0));
-          REQUIRE_RC(MEMCACHED_NOTFOUND, memcached_exist_by_key(memc, S("master"), S("frog")));
-        }
-      }
     }
   }