testing: fix test case names for CTest

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 9f2239a7be255e40b9e441e62649f3fda528b226..146e62316ff4424a89f163df7014d0f1f3f82f96 100644 (file)
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -4,5 +4,39 @@ set(TESTING_ROOT ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(conf.h.in conf.h @ONLY)
 add_executable(catch_main ${TESTING_SRC})
 set_target_properties(catch_main PROPERTIES CXX_STANDARD 17)
-target_link_libraries(catch_main libhashkit libmemcached libmemcachedutil)
+target_include_directories(catch_main PRIVATE
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}
+        ${CMAKE_SOURCE_DIR}/src
+        ${CMAKE_BINARY_DIR}/src)
+target_link_libraries(catch_main PRIVATE libhashkit libmemcached libmemcachedutil)
 add_dependencies(catch_main ${CLIENTS})
+
+add_test("lib/Server" catch_main "lib/Server")
+add_test("lib/Cluster" catch_main "lib/Cluster")
+
+add_test("hashkit" catch_main "hashkit")
+
+add_test("memcached_append" catch_main "memcached_append")
+add_test("memcached_basic" catch_main "memcached_basic")
+add_test("memcached_callbacks" catch_main "memcached_callbacks")
+add_test("memcached_cas" catch_main "memcached_cas")
+add_test("memcached_dump" catch_main "memcached_dump")
+add_test("memcached_encoding_key" catch_main "memcached_encoding_key")
+add_test("memcached_exist" catch_main "memcached_exist")
+add_test("memcached_generate_hash" catch_main "memcached_generate_hash")
+add_test("memcached_haldenbrand_nblock_tcp_ndelay" catch_main "memcached_haldenbrand_nblock_tcp_ndelay")
+add_test("memcached_inc_dec" catch_main "memcached_inc_dec")
+add_test("memcached_ketama_compat" catch_main "memcached_ketama_compat")
+add_test("memcached_noreply" catch_main "memcached_noreply")
+add_test("memcached_prepend" catch_main "memcached_prepend")
+add_test("memcached_regression_binary_block_add" catch_main "memcached_regression_binary_block_add")
+add_test("memcached_servers" catch_main "memcached_servers")
+add_test("memcached_simple" catch_main "memcached_simple")
+add_test("memcached_util" catch_main "memcached_util")
+
+add_test("memcat" catch_main "memcat")
+add_test("memcp" catch_main "memcp")
+add_test("memdump" catch_main "memdump")
+add_test("memerror" catch_main "memerror")
+add_test("memexist" catch_main "memexist")

diff --git a/testing/tests/bin/memdump.cpp b/testing/tests/bin/memdump.cpp
index fe3023350243afe875687965be0a01e9aac1c6da..6b636bcab2d230194ecbc99c1f65380324e5685c 100644 (file)
--- a/testing/tests/bin/memdump.cpp
+++ b/testing/tests/bin/memdump.cpp
@@ -44,6 +44,8 @@ TEST_CASE("memdump") {
       REQUIRE_SUCCESS(memcached_set(*memc, S("key1"), S("val1"), 0, 0));
       REQUIRE_SUCCESS(memcached_set(*memc, S("key2"), S("val2"), 0, 0));
 
+      this_thread::sleep_for(500ms);
+
       string output;
       REQUIRE(sh.run(comm, output));
       REQUIRE_THAT(output, Contains("key1") && Contains("key2"));

diff --git a/testing/tests/memcached/append.cpp b/testing/tests/memcached/append.cpp
index 96244dfe2cf5d9c4efd56161549bb598e2cc1dea..c9051040bac25eab34221b1c0c1ee22b28ae8393 100644 (file)
--- a/testing/tests/memcached/append.cpp
+++ b/testing/tests/memcached/append.cpp
@@ -3,7 +3,7 @@
 
 DECLARE_STREQUAL;
 
-TEST_CASE("memcached append") {
+TEST_CASE("memcached_append") {
   pair<string, MemcachedCluster> tests[] = {
       {"bin_mixed", MemcachedCluster::mixed()},
       {"mixed", MemcachedCluster::mixed()}

diff --git a/testing/tests/memcached/basic.cpp b/testing/tests/memcached/basic.cpp
index 687ee9e105abfaeb476787bc1100214ca2f3d63f..3e538768eeaa110748cebdca239c8fd24d4290ad 100644 (file)
--- a/testing/tests/memcached/basic.cpp
+++ b/testing/tests/memcached/basic.cpp
@@ -2,7 +2,7 @@
 
 #include "libmemcached/is.h"
 
-TEST_CASE("memcached basic") {
+TEST_CASE("memcached_basic") {
   SECTION("library") {
     REQUIRE(string(LIBMEMCACHED_VERSION_STRING) == memcached_lib_version());
   }

diff --git a/testing/tests/memcached/callbacks.cpp b/testing/tests/memcached/callbacks.cpp
index cfa1f4f6fa4ab0d1842f229e0465a1a1a02e9a69..a37284026a4b9f4326911f6c075423d053fdd5f7 100644 (file)
--- a/testing/tests/memcached/callbacks.cpp
+++ b/testing/tests/memcached/callbacks.cpp
@@ -17,7 +17,7 @@ static memcached_return_t cleanup_callback(memcached_st *) {
   return MEMCACHED_SUCCESS;
 }
 
-TEST_CASE("memcached callbacks") {
+TEST_CASE("memcached_callbacks") {
   auto test{MemcachedCluster::mixed()};
   auto memc = &test.memc;
   memcached_return_t rc;

diff --git a/testing/tests/memcached/cas.cpp b/testing/tests/memcached/cas.cpp
index 7335878e0f7167ec7913bca41277365d32d911b6..4b2b9d2906136af3886f04c0d6b2008061d9a9dc 100644 (file)
--- a/testing/tests/memcached/cas.cpp
+++ b/testing/tests/memcached/cas.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached cas") {
+TEST_CASE("memcached_cas") {
   pair<string, MemcachedCluster> tests[] = {
       {"network", MemcachedCluster::network()},
       {"socket", MemcachedCluster::socket()}

diff --git a/testing/tests/memcached/dump.cpp b/testing/tests/memcached/dump.cpp
index 9956b22e319978a5b61bab387a1f1dde76115d8c..5112ae795517eb6ea6cf0cde2cf732330abeb2ea 100644 (file)
--- a/testing/tests/memcached/dump.cpp
+++ b/testing/tests/memcached/dump.cpp
@@ -7,7 +7,7 @@ memcached_return_t dump_cb(const memcached_st *, const char *, size_t, void *ctx
   return MEMCACHED_SUCCESS;
 }
 
-TEST_CASE("memcached dump") {
+TEST_CASE("memcached_dump") {
   pair<string, MemcachedCluster> tests[]{
     {"mixed", MemcachedCluster::mixed()},
     {"network", MemcachedCluster::network()},

diff --git a/testing/tests/memcached/encoding_key.cpp b/testing/tests/memcached/encoding_key.cpp
index c4616ce4f17496397268a1773811ed2aff77962c..6edb04dad785dfb7f7f0289b4d69ec6f0ca3bbce 100644 (file)
--- a/testing/tests/memcached/encoding_key.cpp
+++ b/testing/tests/memcached/encoding_key.cpp
@@ -19,7 +19,7 @@ static inline void check(memcached_st *enc, memcached_st *raw, const char *val,
   REQUIRE_FALSE(memcmp(val, *enc_value, enc_length));
 }
 
-TEST_CASE("memcached encoding_key") {
+TEST_CASE("memcached_encoding_key") {
   pair<string, MemcachedCluster> tests[]{
     {"network", MemcachedCluster::network()},
     {"socket", MemcachedCluster::socket()}

diff --git a/testing/tests/memcached/exist.cpp b/testing/tests/memcached/exist.cpp
index a0eeede46c1a28b9bdd0e23d83be5456279ab85e..9d0add595b6eba13aecaeb2f0ecf1dfe00e8ca1c 100644 (file)
--- a/testing/tests/memcached/exist.cpp
+++ b/testing/tests/memcached/exist.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached exist") {
+TEST_CASE("memcached_exist") {
   pair<string, MemcachedCluster> tests[]{
     {"bin_mixed", MemcachedCluster::mixed()},
     {"network", MemcachedCluster::network()},

diff --git a/testing/tests/memcached/generate_hash.cpp b/testing/tests/memcached/generate_hash.cpp
index 30e02e12fa4464125659d983825e2a4f60c38f8a..06a7800e22ec8034749ea1bc3febbe8aca09b617 100644 (file)
--- a/testing/tests/memcached/generate_hash.cpp
+++ b/testing/tests/memcached/generate_hash.cpp
@@ -5,7 +5,7 @@ static constexpr const uint32_t md5_hosts[] = {4U, 1U, 0U, 1U, 4U, 2U, 0U, 3U, 0
 static constexpr const uint32_t crc_hosts[] = {2U, 4U, 1U, 0U, 2U, 4U, 4U, 4U, 1U, 2U, 3U, 4U, 3U, 4U, 1U, 3U, 3U, 2U, 0U, 0U, 0U, 1U, 2U, 4U, 0U};
 static constexpr const uint32_t *hosts[] = {nullptr, md5_hosts, crc_hosts};
 
-TEST_CASE("memcached generate_hash") {
+TEST_CASE("memcached_generate_hash") {
   MemcachedPtr memc(memcached(S("--server=localhost:1 --server=localhost:2 --server=localhost:3 --server=localhost:4 --server=localhost5 --DISTRIBUTION=modula")));
 
   REQUIRE(*memc);

diff --git a/testing/tests/memcached/haldenbrand.cpp b/testing/tests/memcached/haldenbrand.cpp
index 8dedcdf10a579c0de7e229c8c4ecbe2912daa67f..a640da680809ef374ef2f6bfccaf36a7f489ac3a 100644 (file)
--- a/testing/tests/memcached/haldenbrand.cpp
+++ b/testing/tests/memcached/haldenbrand.cpp
@@ -8,7 +8,7 @@
 
 #include <cstdlib>
 
-TEST_CASE("memcached haldenbrand nblock_tcp_ndelay") {
+TEST_CASE("memcached_haldenbrand_nblock_tcp_ndelay") {
   pair<string, MemcachedCluster> tests[] = {
       {"network", MemcachedCluster::network()},
   };

diff --git a/testing/tests/memcached/inc_dec.cpp b/testing/tests/memcached/inc_dec.cpp
index dff068b64dba09144fb563aeebac521869c5965e..c007b16ef87c10530730b3f6a32249dd580d122e 100644 (file)
--- a/testing/tests/memcached/inc_dec.cpp
+++ b/testing/tests/memcached/inc_dec.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached inc_dec") {
+TEST_CASE("memcached_inc_dec") {
   pair<string, MemcachedCluster> tests[] = {
       {"mixed", MemcachedCluster::mixed()},
   };

diff --git a/testing/tests/memcached/ketama.cpp b/testing/tests/memcached/ketama.cpp
index 2a5a9693ba72e89080bd502708de888e485ff25b..919c01bc3fa5d2ee9b7944439c1561ee1c8547bc 100644 (file)
--- a/testing/tests/memcached/ketama.cpp
+++ b/testing/tests/memcached/ketama.cpp
@@ -8,7 +8,7 @@
 
 DECLARE_STREQUAL;
 
-TEST_CASE("memcached ketama_compat") {
+TEST_CASE("memcached_ketama_compat") {
   auto test = MemcachedCluster::network();
   auto memc = &test.memc;
 

diff --git a/testing/tests/memcached/noreply.cpp b/testing/tests/memcached/noreply.cpp
index ec324587563ddd157721a3db49f44e34169c6d9a..c17147bd1b29c729d1d7a44a13e8f25c24e2d273 100644 (file)
--- a/testing/tests/memcached/noreply.cpp
+++ b/testing/tests/memcached/noreply.cpp
@@ -8,7 +8,7 @@ inline action_t operator ++ (action_t &a) {
 
 constexpr static const int keys = 5000;
 
-TEST_CASE("memcached noreply") {
+TEST_CASE("memcached_noreply") {
   auto test{MemcachedCluster::mixed()};
   auto memc = &test.memc;
 

diff --git a/testing/tests/memcached/prepend.cpp b/testing/tests/memcached/prepend.cpp
index 323cd752099b2f7a86118658ac0cace660010a02..5e898b0a7ce1c4c0e1104ebc5ceaa152b2db1694 100644 (file)
--- a/testing/tests/memcached/prepend.cpp
+++ b/testing/tests/memcached/prepend.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached prepend") {
+TEST_CASE("memcached_prepend") {
   pair<string, MemcachedCluster> tests[] = {
       {"network", MemcachedCluster::network()},
       {"socket", MemcachedCluster::socket()}

diff --git a/testing/tests/memcached/regression/binary_block_add.cpp b/testing/tests/memcached/regression/binary_block_add.cpp
index 6c99223a02e264d663e5d123a86dee88a27d870b..376c7dfddeabdac8f4ff4de7d54fd57cfdb23d68 100644 (file)
--- a/testing/tests/memcached/regression/binary_block_add.cpp
+++ b/testing/tests/memcached/regression/binary_block_add.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached regression binary_block_add") {
+TEST_CASE("memcached_regression_binary_block_add") {
   auto test = MemcachedCluster::network();
   auto memc = &test.memc;
   auto blob = random_ascii_string(1024);

diff --git a/testing/tests/memcached/servers.cpp b/testing/tests/memcached/servers.cpp
index 1c3d699c7922339d808f0d36413e3481248e68f5..6beda33ec3c5be3f2aa83f312eb4b7fb78b2b708 100644 (file)
--- a/testing/tests/memcached/servers.cpp
+++ b/testing/tests/memcached/servers.cpp
@@ -14,7 +14,7 @@ static memcached_return_t server_display_function(const memcached_st *,
   return MEMCACHED_SUCCESS;
 }
 
-TEST_CASE("memcached servers") {
+TEST_CASE("memcached_servers") {
   SECTION("memcached_servers_parse") {
     SECTION("does not leak memory") {
       memcached_server_st *s = memcached_servers_parse("1.2.3.4:1234");

diff --git a/testing/tests/memcached/simple.cpp b/testing/tests/memcached/simple.cpp
index 7d6f9af4e84ec315d590b132ba92be0d7037603b..28273d37273b115693d40e9e0544772a37803444 100644 (file)
--- a/testing/tests/memcached/simple.cpp
+++ b/testing/tests/memcached/simple.cpp
@@ -1,7 +1,7 @@
 #include "testing/lib/common.hpp"
 #include "testing/lib/MemcachedCluster.hpp"
 
-TEST_CASE("memcached simple") {
+TEST_CASE("memcached_simple") {
   pair<string, MemcachedCluster> tests[] = {
       {"network", MemcachedCluster::network()},
       {"socket", MemcachedCluster::socket()}

diff --git a/testing/tests/memcached/util.cpp b/testing/tests/memcached/util.cpp
index 11f2a460278ad030a96cc3d9fd850467e68da077..1ea6118603b98d64839d18070b32694a18804d2d 100644 (file)
--- a/testing/tests/memcached/util.cpp
+++ b/testing/tests/memcached/util.cpp
@@ -12,7 +12,7 @@ static memcached_return_t ping_callback(const memcached_st *, const memcached_in
   return MEMCACHED_SUCCESS;
 }
 
-TEST_CASE("memcached util") {
+TEST_CASE("memcached_util") {
   SECTION("version_check") {
     auto test = MemcachedCluster::mixed();
     auto memc = &test.memc;
@@ -63,4 +63,14 @@ TEST_CASE("memcached util") {
 
     REQUIRE_SUCCESS(memcached_server_cursor(memc, fptr, nullptr, 1));
   }
+
+  SECTION("flush") {
+    auto test = MemcachedCluster::network();
+
+    for (auto &server : test.cluster.getServers()) {
+      memcached_return_t rc;
+      REQUIRE(libmemcached_util_flush("localhost", get<int>(server.getSocketOrPort()), &rc));
+      REQUIRE_SUCCESS(rc);
+    }
+  }
 }