diff options
Diffstat (limited to 'tests/libmemcached-1.0')
25 files changed, 48 insertions, 45 deletions
diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index 6dbd6d8c..72f68f2e 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -16,7 +16,7 @@ #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <cstdio> #include <cstdlib> diff --git a/tests/libmemcached-1.0/basic.cc b/tests/libmemcached-1.0/basic.cc index 715490dc..fddb7218 100644 --- a/tests/libmemcached-1.0/basic.cc +++ b/tests/libmemcached-1.0/basic.cc @@ -38,7 +38,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "libmemcached/is.h" #include "tests/basic.h" diff --git a/tests/libmemcached-1.0/debug.cc b/tests/libmemcached-1.0/debug.cc index 6beccc85..3af0542b 100644 --- a/tests/libmemcached-1.0/debug.cc +++ b/tests/libmemcached-1.0/debug.cc @@ -42,7 +42,7 @@ using namespace libtest; -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <tests/debug.h> #include <tests/print.h> diff --git a/tests/libmemcached-1.0/deprecated.cc b/tests/libmemcached-1.0/deprecated.cc index 891a4c94..3016dadb 100644 --- a/tests/libmemcached-1.0/deprecated.cc +++ b/tests/libmemcached-1.0/deprecated.cc @@ -38,7 +38,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <tests/deprecated.h> test_return_t server_list_null_test(memcached_st *ptr) diff --git a/tests/libmemcached-1.0/dump.cc b/tests/libmemcached-1.0/dump.cc index 107828d4..a04a2c93 100644 --- a/tests/libmemcached-1.0/dump.cc +++ b/tests/libmemcached-1.0/dump.cc @@ -41,8 +41,8 @@ #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> using namespace libtest; diff --git a/tests/libmemcached-1.0/encoding_key.cc b/tests/libmemcached-1.0/encoding_key.cc index 24707582..98804bb5 100644 --- a/tests/libmemcached-1.0/encoding_key.cc +++ b/tests/libmemcached-1.0/encoding_key.cc @@ -38,8 +38,8 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> #include "tests/libmemcached-1.0/encoding_key.h" diff --git a/tests/libmemcached-1.0/error_conditions.cc b/tests/libmemcached-1.0/error_conditions.cc index 584f4c69..2b082a01 100644 --- a/tests/libmemcached-1.0/error_conditions.cc +++ b/tests/libmemcached-1.0/error_conditions.cc @@ -40,7 +40,7 @@ #define BUILDING_LIBMEMCACHED -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "libmemcached/is.h" #include <tests/error_conditions.h> diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc index f14d2bf7..4b3de418 100644 --- a/tests/libmemcached-1.0/generate.cc +++ b/tests/libmemcached-1.0/generate.cc @@ -38,7 +38,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcachedutil-1.2/util.h> #include <libmemcached/is.h> #include <tests/libmemcached-1.0/generate.h> diff --git a/tests/libmemcached-1.0/ketama.cc b/tests/libmemcached-1.0/ketama.cc index 2fd726a6..9e56fe91 100644 --- a/tests/libmemcached-1.0/ketama.cc +++ b/tests/libmemcached-1.0/ketama.cc @@ -37,7 +37,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "libmemcached/server_instance.h" #include "libmemcached/continuum.hpp" diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 49be55da..ae13bd1b 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -46,7 +46,7 @@ Test cases */ -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <libmemcached/is.h> #include <libmemcached/server_instance.h> @@ -76,7 +76,7 @@ using namespace libtest; -#include <libmemcachedutil-1.0/util.h> +#include <libmemcachedutil-1.2/util.h> #include "tests/hash_results.h" @@ -1875,7 +1875,7 @@ test_return_t add_host_test(memcached_st *memc) test_return_t regression_1048945_TEST(memcached_st*) { - memcached_return status; + memcached_return_t status; memcached_server_st* list= memcached_server_list_append_with_weight(NULL, "a", 11211, 0, &status); test_compare(status, MEMCACHED_SUCCESS); @@ -2609,6 +2609,7 @@ test_return_t user_supplied_bug16(memcached_st *memc) /* Check the validity of chinese key*/ test_return_t user_supplied_bug17(memcached_st *memc) { + test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, false), MEMCACHED_SUCCESS); const char *key= "豆瓣"; const char *value="我们在炎热抑郁的夏天无法停止豆瓣"; memcached_return_t rc= memcached_set(memc, key, strlen(key), @@ -3807,7 +3808,7 @@ test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // Create a handle. memcached_st *tl_memc_h= memcached(test_literal_param("--server=localhost:9898 --server=localhost:9899")); // This server should not exist @@ -3833,7 +3834,7 @@ test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // See if memcached is reachable. char *value= memcached_get(memc, @@ -3857,7 +3858,7 @@ test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // Create a handle. memcached_st *tl_memc_h= memcached_create(NULL); @@ -3887,7 +3888,7 @@ test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc) { size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; // See if memcached is reachable. char *value= memcached_get_by_key(memc, @@ -4039,6 +4040,7 @@ test_return_t regression_bug_442914(memcached_st *original_memc) test_skip(original_memc->servers[0].type, MEMCACHED_CONNECTION_TCP); memcached_st* memc= create_single_instance_memcached(original_memc, "--NOREPLY --TCP-NODELAY"); + test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, false), MEMCACHED_SUCCESS); for (uint32_t x= 0; x < 250; ++x) { @@ -4308,6 +4310,7 @@ test_return_t test_multiple_get_last_disconnect(memcached_st *) memcached_st *memc= memcached(server_string, strlen(server_string)); test_true(memc); + test_compare(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, false), MEMCACHED_SUCCESS); // We will just use the error strings as our keys uint32_t counter= 100; @@ -4446,7 +4449,7 @@ test_return_t wrong_failure_counter_two_test(memcached_st *memc) /* Check if we still are connected */ uint32_t flags; size_t string_length; - memcached_return rc; + memcached_return_t rc; char *string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); @@ -4511,7 +4514,7 @@ test_return_t regression_bug_490486(memcached_st *original_memc) char blob[1024]= { 0 }; for (size_t x= 0; x < keys.size(); ++x) { - memcached_return rc= memcached_set(memc, + memcached_return_t rc= memcached_set(memc, keys.key_at(x), keys.length_at(x), blob, sizeof(blob), 0, 0); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); // MEMCACHED_TIMEOUT <-- hash been observed on OSX @@ -4521,7 +4524,7 @@ test_return_t regression_bug_490486(memcached_st *original_memc) /* Try to get all of them with a large multiget */ size_t counter= 0; - memcached_execute_function callbacks[]= { &callback_counter }; + memcached_execute_fn callbacks[]= { &callback_counter }; memcached_return_t rc= memcached_mget_execute(memc, keys.keys_ptr(), keys.lengths_ptr(), keys.size(), callbacks, &counter, 1); @@ -4709,7 +4712,7 @@ test_return_t regression_bug_490520(memcached_st *original_memc) char key[251]; int key_length= snprintf(key, sizeof(key), "0200%u", x); - memcached_return rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); + memcached_return_t rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); } @@ -4802,7 +4805,7 @@ test_return_t regression_bug_854604(memcached_st *) return TEST_SUCCESS; } -static void die_message(memcached_st* mc, memcached_return error, const char* what, uint32_t it) +static void die_message(memcached_st* mc, memcached_return_t error, const char* what, uint32_t it) { fprintf(stderr, "Iteration #%u: ", it); @@ -4833,7 +4836,7 @@ test_return_t regression_bug_(memcached_st *memc) for (uint32_t x= 0; x < TEST_CONSTANT_CREATION; x++) { memcached_st* mc= memcached_create(NULL); - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); if (rc != MEMCACHED_SUCCESS) diff --git a/tests/libmemcached-1.0/memcached_fetch_execute.cc b/tests/libmemcached-1.0/memcached_fetch_execute.cc index c74d2ec9..20ab0387 100644 --- a/tests/libmemcached-1.0/memcached_fetch_execute.cc +++ b/tests/libmemcached-1.0/memcached_fetch_execute.cc @@ -37,7 +37,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <libmemcached/util.h> using namespace libtest; diff --git a/tests/libmemcached-1.0/memcached_get.cc b/tests/libmemcached-1.0/memcached_get.cc index dc046544..38f114c0 100644 --- a/tests/libmemcached-1.0/memcached_get.cc +++ b/tests/libmemcached-1.0/memcached_get.cc @@ -41,7 +41,7 @@ Test cases */ -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "tests/libmemcached-1.0/memcached_get.h" #include "tests/libmemcached-1.0/setup_and_teardowns.h" diff --git a/tests/libmemcached-1.0/namespace.cc b/tests/libmemcached-1.0/namespace.cc index a1c362a9..6510a755 100644 --- a/tests/libmemcached-1.0/namespace.cc +++ b/tests/libmemcached-1.0/namespace.cc @@ -40,7 +40,7 @@ using namespace libtest; -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <tests/namespace.h> diff --git a/tests/libmemcached-1.0/parser.cc b/tests/libmemcached-1.0/parser.cc index 33f95c5a..f93ea266 100644 --- a/tests/libmemcached-1.0/parser.cc +++ b/tests/libmemcached-1.0/parser.cc @@ -44,8 +44,8 @@ using namespace libtest; #include <string> #include <cerrno> -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> #include <tests/libmemcached-1.0/parser.h> #include <tests/print.h> diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp index 34fe7f28..ff6a5ab0 100644 --- a/tests/libmemcached-1.0/plus.cpp +++ b/tests/libmemcached-1.0/plus.cpp @@ -40,7 +40,7 @@ /* C++ interface test */ -#include <libmemcached-1.0/memcached.hpp> +#include <libmemcached-1.2/memcached.hpp> #include <libtest/test.hpp> #include <cstdio> diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc index 2e008d39..fcb47d95 100644 --- a/tests/libmemcached-1.0/pool.cc +++ b/tests/libmemcached-1.0/pool.cc @@ -47,8 +47,8 @@ using namespace libtest; #include <semaphore.h> -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> #include <libmemcached/is.h> #include <tests/pool.h> diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc index 161223de..a05901d0 100644 --- a/tests/libmemcached-1.0/print.cc +++ b/tests/libmemcached-1.0/print.cc @@ -43,7 +43,7 @@ using namespace libtest; #include <iostream> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "tests/print.h" diff --git a/tests/libmemcached-1.0/replication.cc b/tests/libmemcached-1.0/replication.cc index 363eaadb..1439228b 100644 --- a/tests/libmemcached-1.0/replication.cc +++ b/tests/libmemcached-1.0/replication.cc @@ -40,7 +40,7 @@ using namespace libtest; -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "libmemcached/server_instance.h" diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc index b85d3277..fbda1cfe 100644 --- a/tests/libmemcached-1.0/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc @@ -43,7 +43,7 @@ using namespace libtest; Test cases */ -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> static test_return_t pre_sasl(memcached_st *) { diff --git a/tests/libmemcached-1.0/server_add.cc b/tests/libmemcached-1.0/server_add.cc index 6539df06..ca952b69 100644 --- a/tests/libmemcached-1.0/server_add.cc +++ b/tests/libmemcached-1.0/server_add.cc @@ -40,7 +40,7 @@ using namespace libtest; -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <tests/server_add.h> diff --git a/tests/libmemcached-1.0/setup_and_teardowns.cc b/tests/libmemcached-1.0/setup_and_teardowns.cc index 6655cb57..493bbb21 100644 --- a/tests/libmemcached-1.0/setup_and_teardowns.cc +++ b/tests/libmemcached-1.0/setup_and_teardowns.cc @@ -38,7 +38,7 @@ #include <mem_config.h> #include <libtest/test.hpp> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcachedutil-1.2/util.h> #include "tests/print.h" #include "tests/libmemcached-1.0/setup_and_teardowns.h" diff --git a/tests/libmemcached-1.0/stat.cc b/tests/libmemcached-1.0/stat.cc index 60318790..dc993c98 100644 --- a/tests/libmemcached-1.0/stat.cc +++ b/tests/libmemcached-1.0/stat.cc @@ -41,8 +41,8 @@ #include <libtest/test.hpp> -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> using namespace libtest; diff --git a/tests/libmemcached-1.0/string.cc b/tests/libmemcached-1.0/string.cc index 25613d8f..0458da5a 100644 --- a/tests/libmemcached-1.0/string.cc +++ b/tests/libmemcached-1.0/string.cc @@ -40,7 +40,7 @@ #include <mem_config.h> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include "libmemcached/string.hpp" #include "libmemcached/is.h" diff --git a/tests/libmemcached-1.0/touch.cc b/tests/libmemcached-1.0/touch.cc index 9bd562a2..2fbddc67 100644 --- a/tests/libmemcached-1.0/touch.cc +++ b/tests/libmemcached-1.0/touch.cc @@ -40,8 +40,8 @@ using namespace libtest; -#include <libmemcached-1.0/memcached.h> -#include <libmemcachedutil-1.0/util.h> +#include <libmemcached-1.2/memcached.h> +#include <libmemcachedutil-1.2/util.h> #include "tests/touch.h" @@ -60,7 +60,7 @@ test_return_t test_memcached_touch(memcached_st *memc) size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; test_null(memcached_get(memc, test_literal_param(__func__), @@ -106,7 +106,7 @@ test_return_t test_memcached_touch_by_key(memcached_st *memc) size_t len; uint32_t flags; - memcached_return rc; + memcached_return_t rc; test_null(memcached_get_by_key(memc, test_literal_param("grouping_key"), diff --git a/tests/libmemcached-1.0/virtual_buckets.cc b/tests/libmemcached-1.0/virtual_buckets.cc index a50477c9..f48479b2 100644 --- a/tests/libmemcached-1.0/virtual_buckets.cc +++ b/tests/libmemcached-1.0/virtual_buckets.cc @@ -42,7 +42,7 @@ using namespace libtest; #include <tests/virtual_buckets.h> -#include <libmemcached-1.0/memcached.h> +#include <libmemcached-1.2/memcached.h> #include <cstring> |