X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffunction.c;h=6549f582f3f3909faf07279e8cb122966effd404;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=f1074697d4853d6f820238376beb1bc629740db1;hpb=d4c5a2229396c74f3e66767f01ce4c8853eba92b;p=m6w6%2Flibmemcached diff --git a/tests/function.c b/tests/function.c index f1074697..6549f582 100644 --- a/tests/function.c +++ b/tests/function.c @@ -55,16 +55,16 @@ static test_return_t init_test(memcached_st *not_used __attribute__((unused))) static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unused))) { memcached_server_st *server_list; - memcached_return rc; + memcached_return_t rc; server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, NULL); - assert(server_list == NULL); + test_truth(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, "localhost", 0, 0, NULL); - assert(server_list == NULL); + test_truth(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, &rc); - assert(server_list == NULL); + test_truth(server_list == NULL); return TEST_SUCCESS; } @@ -72,7 +72,7 @@ static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unu #define TEST_PORT_COUNT 7 uint32_t test_ports[TEST_PORT_COUNT]; -static memcached_return server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) { /* Do Nothing */ uint32_t bigger= *((uint32_t *)(context)); @@ -85,22 +85,22 @@ static memcached_return server_display_function(memcached_st *ptr __attribute__ static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); for (x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (uint32_t)random() % 64000; rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - assert(local_memc->number_of_hosts == x + 1); - assert(local_memc->hosts[0].count == x+1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->number_of_hosts == x + 1); + test_truth(local_memc->hosts[0].count == x+1); + test_truth(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_function; @@ -114,24 +114,24 @@ static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused)) static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))) { - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); rc= memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43043, 0); - assert(rc == MEMCACHED_SUCCESS); - assert(local_memc->hosts[0].port == 43043); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->hosts[0].port == 43043); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43042, 0); - assert(rc == MEMCACHED_SUCCESS); - assert(local_memc->hosts[0].port == 43042); - assert(local_memc->hosts[1].port == 43043); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->hosts[0].port == 43042); + test_truth(local_memc->hosts[1].port == 43043); callbacks[0]= server_display_function; memcached_server_cursor(local_memc, callbacks, (void *)&bigger, 1); @@ -142,7 +142,7 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused) return TEST_SUCCESS; } -static memcached_return server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) { /* Do Nothing */ uint32_t x= *((uint32_t *)(context)); @@ -156,22 +156,22 @@ static memcached_return server_display_unsort_function(memcached_st *ptr __attr static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; - uint32_t counter= 0; /* Prime the value for the assert in server_display_function */ - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t counter= 0; /* Prime the value for the test_truth in server_display_function */ + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); for (x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (uint32_t)(random() % 64000); rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - assert(local_memc->number_of_hosts == x+1); - assert(local_memc->hosts[0].count == x+1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->number_of_hosts == x+1); + test_truth(local_memc->hosts[0].count == x+1); + test_truth(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_unsort_function; @@ -192,7 +192,7 @@ static test_return_t allocation_test(memcached_st *not_used __attribute__((unus { memcached_st *memc; memc= memcached_create(NULL); - assert(memc); + test_truth(memc); memcached_free(memc); return TEST_SUCCESS; @@ -204,7 +204,7 @@ static test_return_t clone_test(memcached_st *memc) { memcached_st *memc_clone; memc_clone= memcached_clone(NULL, NULL); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } @@ -212,32 +212,50 @@ static test_return_t clone_test(memcached_st *memc) { memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); - - assert(memc_clone->call_free == memc->call_free); - assert(memc_clone->call_malloc == memc->call_malloc); - assert(memc_clone->call_realloc == memc->call_realloc); - assert(memc_clone->call_calloc == memc->call_calloc); - assert(memc_clone->connect_timeout == memc->connect_timeout); - assert(memc_clone->delete_trigger == memc->delete_trigger); - assert(memc_clone->distribution == memc->distribution); - assert(memc_clone->flags == memc->flags); - assert(memc_clone->get_key_failure == memc->get_key_failure); - assert(memc_clone->hash == memc->hash); - assert(memc_clone->hash_continuum == memc->hash_continuum); - assert(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); - assert(memc_clone->io_msg_watermark == memc->io_msg_watermark); - assert(memc_clone->io_key_prefetch == memc->io_key_prefetch); - assert(memc_clone->on_cleanup == memc->on_cleanup); - assert(memc_clone->on_clone == memc->on_clone); - assert(memc_clone->poll_timeout == memc->poll_timeout); - assert(memc_clone->rcv_timeout == memc->rcv_timeout); - assert(memc_clone->recv_size == memc->recv_size); - assert(memc_clone->retry_timeout == memc->retry_timeout); - assert(memc_clone->send_size == memc->send_size); - assert(memc_clone->server_failure_limit == memc->server_failure_limit); - assert(memc_clone->snd_timeout == memc->snd_timeout); - assert(memc_clone->user_data == memc->user_data); + test_truth(memc_clone); + + test_truth(memc_clone->call_free == memc->call_free); + test_truth(memc_clone->call_malloc == memc->call_malloc); + test_truth(memc_clone->call_realloc == memc->call_realloc); + test_truth(memc_clone->call_calloc == memc->call_calloc); + test_truth(memc_clone->connect_timeout == memc->connect_timeout); + test_truth(memc_clone->delete_trigger == memc->delete_trigger); + test_truth(memc_clone->distribution == memc->distribution); + { // Test all of the flags + test_truth(memc_clone->flags.no_block == memc->flags.no_block); + test_truth(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay); + test_truth(memc_clone->flags.reuse_memory == memc->flags.reuse_memory); + test_truth(memc_clone->flags.use_md5 == memc->flags.use_md5); + test_truth(memc_clone->flags.use_crc == memc->flags.use_crc); + test_truth(memc_clone->flags.use_cache_lookups == memc->flags.use_cache_lookups); + test_truth(memc_clone->flags.support_cas == memc->flags.support_cas); + test_truth(memc_clone->flags.buffer_requests == memc->flags.buffer_requests); + test_truth(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts); + test_truth(memc_clone->flags.verify_key == memc->flags.verify_key); + test_truth(memc_clone->flags.ketama_weighted == memc->flags.ketama_weighted); + test_truth(memc_clone->flags.binary_protocol == memc->flags.binary_protocol); + test_truth(memc_clone->flags.hash_with_prefix_key == memc->flags.hash_with_prefix_key); + test_truth(memc_clone->flags.no_reply == memc->flags.no_reply); + test_truth(memc_clone->flags.use_udp == memc->flags.use_udp); + test_truth(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts); + test_truth(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read); + } + test_truth(memc_clone->get_key_failure == memc->get_key_failure); + test_truth(memc_clone->hash == memc->hash); + test_truth(memc_clone->hash_continuum == memc->hash_continuum); + test_truth(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); + test_truth(memc_clone->io_msg_watermark == memc->io_msg_watermark); + test_truth(memc_clone->io_key_prefetch == memc->io_key_prefetch); + test_truth(memc_clone->on_cleanup == memc->on_cleanup); + test_truth(memc_clone->on_clone == memc->on_clone); + test_truth(memc_clone->poll_timeout == memc->poll_timeout); + test_truth(memc_clone->rcv_timeout == memc->rcv_timeout); + test_truth(memc_clone->recv_size == memc->recv_size); + test_truth(memc_clone->retry_timeout == memc->retry_timeout); + test_truth(memc_clone->send_size == memc->send_size); + test_truth(memc_clone->server_failure_limit == memc->server_failure_limit); + test_truth(memc_clone->snd_timeout == memc->snd_timeout); + test_truth(memc_clone->user_data == memc->user_data); memcached_free(memc_clone); } @@ -248,7 +266,7 @@ static test_return_t clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, NULL); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } @@ -258,7 +276,7 @@ static test_return_t clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, memc); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } @@ -268,26 +286,26 @@ static test_return_t clone_test(memcached_st *memc) static test_return_t userdata_test(memcached_st *memc) { void* foo= NULL; - assert(memcached_set_user_data(memc, foo) == NULL); - assert(memcached_get_user_data(memc) == foo); - assert(memcached_set_user_data(memc, NULL) == foo); + test_truth(memcached_set_user_data(memc, foo) == NULL); + test_truth(memcached_get_user_data(memc) == foo); + test_truth(memcached_set_user_data(memc, NULL) == foo); return TEST_SUCCESS; } static test_return_t connection_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_server_add_with_weight(memc, "localhost", 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } static test_return_t error_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint32_t values[] = { 851992627U, 2337886783U, 3196981036U, 4001849190U, 982370485U, 1263635348U, 4242906218U, 3829656100U, 1891735253U, 334139633U, 2257084983U, 3088286104U, @@ -300,14 +318,14 @@ static test_return_t error_test(memcached_st *memc) 4159057246U, 3425930182U, 2593724503U}; // You have updated the memcache_error messages but not updated docs/tests. - assert(MEMCACHED_MAXIMUM_RETURN == 39); + test_truth(MEMCACHED_MAXIMUM_RETURN == 39); for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++) { uint32_t hash_val; const char *msg= memcached_strerror(memc, rc); hash_val= memcached_generate_hash_value(msg, strlen(msg), MEMCACHED_HASH_JENKINS); - assert(values[rc] == hash_val); + test_truth(values[rc] == hash_val); } return TEST_SUCCESS; @@ -315,21 +333,21 @@ static test_return_t error_test(memcached_st *memc) static test_return_t set_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } static test_return_t append_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fig"; const char *in_value= "we"; char *out_value= NULL; @@ -337,28 +355,28 @@ static test_return_t append_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), in_value, strlen(in_value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_append(memc, key, strlen(key), " the", strlen(" the"), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_append(memc, key, strlen(key), " people", strlen(" people"), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(out_value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(out_value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); free(out_value); return TEST_SUCCESS; @@ -366,7 +384,7 @@ static test_return_t append_test(memcached_st *memc) static test_return_t append_binary_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "numbers"; unsigned int *store_ptr; unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 }; @@ -376,13 +394,13 @@ static test_return_t append_binary_test(memcached_st *memc) unsigned int x; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (x= 0; store_list[x] ; x++) { @@ -390,19 +408,19 @@ static test_return_t append_binary_test(memcached_st *memc) key, strlen(key), (char *)&store_list[x], sizeof(unsigned int), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert((value_length == (sizeof(unsigned int) * x))); - assert(rc == MEMCACHED_SUCCESS); + test_truth((value_length == (sizeof(unsigned int) * x))); + test_truth(rc == MEMCACHED_SUCCESS); store_ptr= (unsigned int *)value; x= 0; while ((size_t)store_ptr < (size_t)(value + value_length)) { - assert(*store_ptr == store_list[x++]); + test_truth(*store_ptr == store_list[x++]); store_ptr++; } free(value); @@ -412,7 +430,7 @@ static test_return_t append_binary_test(memcached_st *memc) static test_return_t cas2_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; const char *value= "we the people"; @@ -423,7 +441,7 @@ static test_return_t cas2_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); @@ -432,7 +450,7 @@ static test_return_t cas2_test(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); @@ -440,14 +458,14 @@ static test_return_t cas2_test(memcached_st *memc) results= memcached_result_create(memc, &results_obj); results= memcached_fetch_result(memc, &results_obj, &rc); - assert(results); - assert(results->cas); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_cas(results)); + test_truth(results); + test_truth(results->cas); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_cas(results)); - assert(!memcmp(value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_free(&results_obj); @@ -456,7 +474,7 @@ static test_return_t cas2_test(memcached_st *memc) static test_return_t cas_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fun"; size_t key_length= strlen(key); const char *value= "we the people"; @@ -471,43 +489,43 @@ static test_return_t cas_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, keylengths, 1); results= memcached_result_create(memc, &results_obj); results= memcached_fetch_result(memc, &results_obj, &rc); - assert(results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_cas(results)); - assert(!memcmp(value, memcached_result_value(results), value_length)); - assert(strlen(memcached_result_value(results)) == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_cas(results)); + test_truth(!memcmp(value, memcached_result_value(results), value_length)); + test_truth(strlen(memcached_result_value(results)) == value_length); + test_truth(rc == MEMCACHED_SUCCESS); uint64_t cas = memcached_result_cas(results); #if 0 results= memcached_fetch_result(memc, &results_obj, &rc); - assert(rc == MEMCACHED_END); - assert(results == NULL); + test_truth(rc == MEMCACHED_END); + test_truth(results == NULL); #endif rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* * The item will have a new cas value, so try to set it again with the old * value. This should fail! */ rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - assert(rc == MEMCACHED_DATA_EXISTS); + test_truth(rc == MEMCACHED_DATA_EXISTS); memcached_result_free(&results_obj); @@ -516,7 +534,7 @@ static test_return_t cas_test(memcached_st *memc) static test_return_t prepend_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fig"; const char *value= "people"; char *out_value= NULL; @@ -524,28 +542,28 @@ static test_return_t prepend_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_prepend(memc, key, strlen(key), "the ", strlen("the "), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_prepend(memc, key, strlen(key), "we ", strlen("we "), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(out_value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(out_value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); free(out_value); return TEST_SUCCESS; @@ -557,7 +575,7 @@ static test_return_t prepend_test(memcached_st *memc) */ static test_return_t add_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; unsigned long long setting_value; @@ -567,7 +585,7 @@ static test_return_t add_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); rc= memcached_add(memc, key, strlen(key), value, strlen(value), @@ -575,9 +593,13 @@ static test_return_t add_test(memcached_st *memc) /* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */ if (setting_value) - assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); + { + test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); + } else - assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); + { + test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); + } return TEST_SUCCESS; } @@ -608,7 +630,7 @@ static test_return_t add_wrapper(memcached_st *memc) static test_return_t replace_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; const char *original= "first we insert some data"; @@ -616,44 +638,44 @@ static test_return_t replace_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), original, strlen(original), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_replace(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } static test_return_t delete_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_delete(memc, key, strlen(key), (time_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } static test_return_t flush_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } -static memcached_return server_function(memcached_st *ptr __attribute__((unused)), +static memcached_return_t server_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server __attribute__((unused)), void *context __attribute__((unused))) { @@ -666,7 +688,7 @@ static test_return_t memcached_server_cursor_test(memcached_st *memc) { char context[8]; strcpy(context, "foo bad"); - memcached_server_function callbacks[1]; + memcached_server_fn callbacks[1]; callbacks[0]= server_function; memcached_server_cursor(memc, callbacks, context, 1); @@ -675,7 +697,7 @@ static test_return_t memcached_server_cursor_test(memcached_st *memc) static test_return_t bad_key_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo bad"; char *string; size_t string_length; @@ -685,41 +707,41 @@ static test_return_t bad_key_test(memcached_st *memc) size_t max_keylen= 0xffff; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); + test_truth(memc_clone); rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* All keys are valid in the binary protocol (except for length) */ if (memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 0) { string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); set= 0; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); /* Test multi key for bad keys */ const char *keys[] = { "GoodKey", "Bad Key", "NotMine" }; size_t key_lengths[] = { 7, 7, 7 }; set= 1; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc_clone, keys, key_lengths, 3); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); rc= memcached_mget_by_key(memc_clone, "foo daddy", 9, keys, key_lengths, 1); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); max_keylen= 250; @@ -728,7 +750,7 @@ static test_return_t bad_key_test(memcached_st *memc) binary protocol */ rc= memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); char *longkey= malloc(max_keylen + 1); if (longkey != NULL) @@ -736,15 +758,15 @@ static test_return_t bad_key_test(memcached_st *memc) memset(longkey, 'a', max_keylen + 1); string= memcached_get(memc_clone, longkey, max_keylen, &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); string= memcached_get(memc_clone, longkey, max_keylen + 1, &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); free(longkey); } @@ -753,12 +775,12 @@ static test_return_t bad_key_test(memcached_st *memc) /* Make sure zero length keys are marked as bad */ set= 1; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, 0, &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); memcached_free(memc_clone); @@ -766,7 +788,7 @@ static test_return_t bad_key_test(memcached_st *memc) } #define READ_THROUGH_VALUE "set for me" -static memcached_return read_through_trigger(memcached_st *memc __attribute__((unused)), +static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)), char *key __attribute__((unused)), size_t key_length __attribute__((unused)), memcached_result_st *result) @@ -777,44 +799,44 @@ static memcached_return read_through_trigger(memcached_st *memc __attribute__(( static test_return_t read_through(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *string; size_t string_length; uint32_t flags; - memcached_trigger_key cb= (memcached_trigger_key)read_through_trigger; + memcached_trigger_key_fn cb= (memcached_trigger_key_fn)read_through_trigger; string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(READ_THROUGH_VALUE)); - assert(!strcmp(READ_THROUGH_VALUE, string)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(READ_THROUGH_VALUE)); + test_truth(!strcmp(READ_THROUGH_VALUE, string)); free(string); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(READ_THROUGH_VALUE)); - assert(!strcmp(READ_THROUGH_VALUE, string)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(READ_THROUGH_VALUE)); + test_truth(!strcmp(READ_THROUGH_VALUE, string)); free(string); return TEST_SUCCESS; } -static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused)), +static memcached_return_t delete_trigger(memcached_st *ptr __attribute__((unused)), const char *key, size_t key_length __attribute__((unused))) { @@ -825,41 +847,41 @@ static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused) static test_return_t delete_through(memcached_st *memc) { - memcached_trigger_delete_key callback; - memcached_return rc; + memcached_trigger_delete_key_fn callback; + memcached_return_t rc; - callback= (memcached_trigger_delete_key)delete_trigger; + callback= (memcached_trigger_delete_key_fn)delete_trigger; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } static test_return_t get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *string; size_t string_length; uint32_t flags; rc= memcached_delete(memc, key, strlen(key), (time_t)0); - assert(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); + test_truth(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); return TEST_SUCCESS; } static test_return_t get_test2(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; char *string; @@ -869,15 +891,15 @@ static test_return_t get_test2(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(string); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(value)); - assert(!memcmp(string, value, string_length)); + test_truth(string); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(value)); + test_truth(!memcmp(string, value, string_length)); free(string); @@ -886,7 +908,7 @@ static test_return_t get_test2(memcached_st *memc) static test_return_t set_test2(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "train in the brain"; size_t value_length= strlen(value); @@ -897,7 +919,7 @@ static test_return_t set_test2(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } return TEST_SUCCESS; @@ -905,13 +927,13 @@ static test_return_t set_test2(memcached_st *memc) static test_return_t set_test3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; char *value; size_t value_length= 8191; unsigned int x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -926,7 +948,7 @@ static test_return_t set_test3(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } free(value); @@ -936,7 +958,7 @@ static test_return_t set_test3(memcached_st *memc) static test_return_t get_test3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 8191; @@ -946,7 +968,7 @@ static test_return_t get_test3(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -954,15 +976,15 @@ static test_return_t get_test3(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string); - assert(string_length == value_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string); + test_truth(string_length == value_length); + test_truth(!memcmp(string, value, string_length)); free(string); free(value); @@ -972,7 +994,7 @@ static test_return_t get_test3(memcached_st *memc) static test_return_t get_test4(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 8191; @@ -982,7 +1004,7 @@ static test_return_t get_test4(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -990,17 +1012,17 @@ static test_return_t get_test4(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); for (x= 0; x < 10; x++) { string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string); - assert(string_length == value_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string); + test_truth(string_length == value_length); + test_truth(!memcmp(string, value, string_length)); free(string); } @@ -1025,30 +1047,30 @@ static test_return_t get_test5(memcached_st *memc) uint32_t flags; size_t rlen; - memcached_return rc= memcached_set(memc, keys[0], lengths[0], + memcached_return_t rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, lengths, 2); memcached_result_st results_obj; memcached_result_st *results; results=memcached_result_create(memc, &results_obj); - assert(results); + test_truth(results); results=memcached_fetch_result(memc, &results_obj, &rc); - assert(results); + test_truth(results); memcached_result_free(&results_obj); /* Don't read out the second result, but issue a set instead.. */ rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); char *val= memcached_get_by_key(memc, keys[0], lengths[0], "yek", 3, &rlen, &flags, &rc); - assert(val == NULL); - assert(rc == MEMCACHED_NOTFOUND); + test_truth(val == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); val= memcached_get(memc, keys[0], lengths[0], &rlen, &flags, &rc); - assert(val != NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); free(val); return TEST_SUCCESS; @@ -1060,14 +1082,14 @@ static test_return_t mget_end(memcached_st *memc) size_t lengths[]= { 3, 4 }; const char *values[]= { "fjord", "41" }; - memcached_return rc; + memcached_return_t rc; // Set foo and foo2 for (int i= 0; i < 2; i++) { rc= memcached_set(memc, keys[i], lengths[i], values[i], strlen(values[i]), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } char *string; @@ -1076,7 +1098,7 @@ static test_return_t mget_end(memcached_st *memc) // retrieve both via mget rc= memcached_mget(memc, keys, lengths, 2); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); char key[MEMCACHED_MAX_KEY]; size_t key_length; @@ -1086,34 +1108,34 @@ static test_return_t mget_end(memcached_st *memc) { string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); int val = 0; if (key_length == 4) val= 1; - assert(string_length == strlen(values[val])); - assert(strncmp(values[val], string, string_length) == 0); + test_truth(string_length == strlen(values[val])); + test_truth(strncmp(values[val], string, string_length) == 0); free(string); } // this should indicate end string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); - assert(rc == MEMCACHED_END); + test_truth(rc == MEMCACHED_END); // now get just one rc= memcached_mget(memc, keys, lengths, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); - assert(key_length == lengths[0]); - assert(strncmp(keys[0], key, key_length) == 0); - assert(string_length == strlen(values[0])); - assert(strncmp(values[0], string, string_length) == 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(key_length == lengths[0]); + test_truth(strncmp(keys[0], key, key_length) == 0); + test_truth(string_length == strlen(values[0])); + test_truth(strncmp(values[0], string, string_length) == 0); + test_truth(rc == MEMCACHED_SUCCESS); free(string); // this should indicate end string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); - assert(rc == MEMCACHED_END); + test_truth(rc == MEMCACHED_END); return TEST_SUCCESS; } @@ -1121,7 +1143,7 @@ static test_return_t mget_end(memcached_st *memc) /* Do not copy the style of this code, I just access hosts to testthis function */ static test_return_t stats_servername_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st memc_stat; rc= memcached_stat_servername(&memc_stat, NULL, memc->hosts[0].hostname, @@ -1133,24 +1155,24 @@ static test_return_t stats_servername_test(memcached_st *memc) static test_return_t increment_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; const char *value= "0"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); return TEST_SUCCESS; } @@ -1160,19 +1182,19 @@ static test_return_t increment_with_initial_test(memcached_st *memc) if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; uint64_t initial= 0; rc= memcached_increment_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == initial); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); rc= memcached_increment_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == (initial + 1)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial + 1)); } return TEST_SUCCESS; } @@ -1180,24 +1202,24 @@ static test_return_t increment_with_initial_test(memcached_st *memc) static test_return_t decrement_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; const char *value= "3"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); return TEST_SUCCESS; } @@ -1207,19 +1229,19 @@ static test_return_t decrement_with_initial_test(memcached_st *memc) if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; uint64_t initial= 3; rc= memcached_decrement_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == initial); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); rc= memcached_decrement_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == (initial - 1)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial - 1)); } return TEST_SUCCESS; } @@ -1227,7 +1249,7 @@ static test_return_t decrement_with_initial_test(memcached_st *memc) static test_return_t increment_by_key_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; const char *value= "0"; @@ -1236,17 +1258,17 @@ static test_return_t increment_by_key_test(memcached_st *memc) key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); return TEST_SUCCESS; } @@ -1256,7 +1278,7 @@ static test_return_t increment_with_initial_by_key_test(memcached_st *memc) if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; uint64_t initial= 0; @@ -1264,14 +1286,14 @@ static test_return_t increment_with_initial_by_key_test(memcached_st *memc) rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == initial); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == (initial + 1)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial + 1)); } return TEST_SUCCESS; } @@ -1279,7 +1301,7 @@ static test_return_t increment_with_initial_by_key_test(memcached_st *memc) static test_return_t decrement_by_key_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; const char *value= "3"; @@ -1288,19 +1310,19 @@ static test_return_t decrement_by_key_test(memcached_st *memc) key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); return TEST_SUCCESS; } @@ -1310,7 +1332,7 @@ static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; uint64_t initial= 3; @@ -1318,41 +1340,41 @@ static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == initial); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, initial, 0, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == (initial - 1)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial - 1)); } return TEST_SUCCESS; } static test_return_t quit_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fudge"; const char *value= "sanford and sun"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)10, (uint32_t)3); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } static test_return_t mget_result_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1361,43 +1383,43 @@ static test_return_t mget_result_test(memcached_st *memc) memcached_result_st *results; results= memcached_result_create(memc, &results_obj); - assert(results); - assert(&results_obj == results); + test_truth(results); + test_truth(&results_obj == results); /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) { - assert(results); + test_truth(results); } while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) - assert(!results); - assert(rc == MEMCACHED_END); + test_truth(!results); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - assert(results); - assert(&results_obj == results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), + test_truth(results); + test_truth(&results_obj == results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_key_length(results) == memcached_result_length(results)); + test_truth(!memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results))); } @@ -1409,7 +1431,7 @@ static test_return_t mget_result_test(memcached_st *memc) static test_return_t mget_result_alloc_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1418,36 +1440,36 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, NULL, &rc)) != NULL) { - assert(results); + test_truth(results); } - assert(!results); - assert(rc == MEMCACHED_END); + test_truth(!results); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); x= 0; while ((results= memcached_fetch_result(memc, NULL, &rc))) { - assert(results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_key_length(results) == memcached_result_length(results)); + test_truth(!memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results))); memcached_result_free(results); @@ -1458,7 +1480,7 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) } /* Count the results */ -static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), +static memcached_return_t callback_counter(memcached_st *ptr __attribute__((unused)), memcached_result_st *result __attribute__((unused)), void *context) { @@ -1471,12 +1493,12 @@ static memcached_return callback_counter(memcached_st *ptr __attribute__((unused static test_return_t mget_result_function(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; unsigned int counter; - memcached_execute_function callbacks[1]; + memcached_execute_fn callbacks[1]; /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); @@ -1485,24 +1507,24 @@ static test_return_t mget_result_function(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - assert(counter == 3); + test_truth(counter == 3); return TEST_SUCCESS; } static test_return_t mget_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1515,39 +1537,39 @@ static test_return_t mget_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); } - assert(!return_value); - assert(return_value_length == 0); - assert(rc == MEMCACHED_END); + test_truth(!return_value); + test_truth(return_value_length == 0); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); x= 0; while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - assert(return_key_length == return_value_length); - assert(!memcmp(return_value, return_key, return_value_length)); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(return_key_length == return_value_length); + test_truth(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } @@ -1576,37 +1598,37 @@ static test_return_t mget_execute(memcached_st *memc) /* First add all of the items.. */ char blob[1024] = {0}; - memcached_return rc; + memcached_return_t rc; for (int x= 0; x < max_keys; ++x) { char k[251]; key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); keys[x]= strdup(k); - assert(keys[x] != NULL); + test_truth(keys[x] != NULL); rc= memcached_add(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } /* Try to get all of them with a large multiget */ unsigned int counter= 0; - memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; rc= memcached_mget_execute(memc, (const char**)keys, key_length, (size_t)max_keys, callbacks, &counter, 1); if (binary) { - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - assert(rc == MEMCACHED_END); + test_truth(rc == MEMCACHED_END); /* Verify that we got all of the items */ - assert(counter == (unsigned int)max_keys); + test_truth(counter == (unsigned int)max_keys); } else { - assert(rc == MEMCACHED_NOT_SUPPORTED); - assert(counter == 0); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(counter == 0); } /* Release all allocated resources */ @@ -1624,12 +1646,12 @@ static test_return_t get_stats_keys(memcached_st *memc) char **list; char **ptr; memcached_stat_st memc_stat; - memcached_return rc; + memcached_return_t rc; list= memcached_stat_get_keys(memc, &memc_stat, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++) - assert(*ptr); + test_truth(*ptr); fflush(stdout); free(list); @@ -1643,7 +1665,7 @@ static test_return_t version_string_test(memcached_st *memc __attribute__((unus version_string= memcached_lib_version(); - assert(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); + test_truth(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); return TEST_SUCCESS; } @@ -1653,19 +1675,19 @@ static test_return_t get_stats(memcached_st *memc) unsigned int x; char **list; char **ptr; - memcached_return rc; + memcached_return_t rc; memcached_stat_st *memc_stat; memc_stat= memcached_stat(memc, NULL, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - assert(rc == MEMCACHED_SUCCESS); - assert(memc_stat); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memc_stat); for (x= 0; x < memcached_server_count(memc); x++) { list= memcached_stat_get_keys(memc, memc_stat+x, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++); free(list); @@ -1680,12 +1702,12 @@ static test_return_t add_host_test(memcached_st *memc) { unsigned int x; memcached_server_st *servers; - memcached_return rc; + memcached_return_t rc; char servername[]= "0.example.com"; servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - assert(servers); - assert(1 == memcached_server_list_count(servers)); + test_truth(servers); + test_truth(1 == memcached_server_list_count(servers)); for (x= 2; x < 20; x++) { @@ -1694,26 +1716,26 @@ static test_return_t add_host_test(memcached_st *memc) snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(x == memcached_server_list_count(servers)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); return TEST_SUCCESS; } -static memcached_return clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) +static memcached_return_t clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) { return MEMCACHED_SUCCESS; } -static memcached_return cleanup_test_callback(memcached_st *ptr __attribute__((unused))) +static memcached_return_t cleanup_test_callback(memcached_st *ptr __attribute__((unused))) { return MEMCACHED_SUCCESS; } @@ -1724,41 +1746,41 @@ static test_return_t callback_test(memcached_st *memc) { int x= 5; int *test_ptr; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_USER_DATA, &x); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); test_ptr= (int *)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc); - assert(*test_ptr == x); + test_truth(*test_ptr == x); } /* Test Clone Callback */ { - memcached_clone_func clone_cb= (memcached_clone_func)clone_test_callback; + memcached_clone_fn clone_cb= (memcached_clone_fn)clone_test_callback; void *clone_cb_ptr= *(void **)&clone_cb; void *temp_function= NULL; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, clone_cb_ptr); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - assert(temp_function == clone_cb_ptr); + test_truth(temp_function == clone_cb_ptr); } /* Test Cleanup Callback */ { - memcached_cleanup_func cleanup_cb= - (memcached_cleanup_func)cleanup_test_callback; + memcached_cleanup_fn cleanup_cb= + (memcached_cleanup_fn)cleanup_test_callback; void *cleanup_cb_ptr= *(void **)&cleanup_cb; void *temp_function= NULL; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, cleanup_cb_ptr); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - assert(temp_function == cleanup_cb_ptr); + test_truth(temp_function == cleanup_cb_ptr); } return TEST_SUCCESS; @@ -1772,52 +1794,52 @@ static test_return_t behavior_test(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - assert(value == 1); + test_truth(value == 1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - assert(value == 1); + test_truth(value == 1); set= MEMCACHED_HASH_MD5; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); set= 0; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - assert(value == 0); + test_truth(value == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - assert(value == 0); + test_truth(value == 0); set= MEMCACHED_HASH_DEFAULT; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_DEFAULT); + test_truth(value == MEMCACHED_HASH_DEFAULT); set= MEMCACHED_HASH_CRC; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_CRC); + test_truth(value == MEMCACHED_HASH_CRC); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); - assert(value > 0); + test_truth(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); - assert(value > 0); + test_truth(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, value + 1); - assert((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); + test_truth((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); return TEST_SUCCESS; } static test_return_t fetch_all_results(memcached_st *memc) { - memcached_return rc= MEMCACHED_SUCCESS; + memcached_return_t rc= MEMCACHED_SUCCESS; char return_key[MEMCACHED_MAX_KEY]; size_t return_key_length; char *return_value; @@ -1827,8 +1849,8 @@ static test_return_t fetch_all_results(memcached_st *memc) while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); free(return_value); } @@ -1845,7 +1867,7 @@ static test_return_t user_supplied_bug1(memcached_st *memc) uint32_t size= 0; char key[10]; char randomstuff[6 * 1024]; - memcached_return rc; + memcached_return_t rc; memset(randomstuff, 0, 6 * 1024); @@ -1863,7 +1885,7 @@ static test_return_t user_supplied_bug1(memcached_st *memc) size= (uint32_t)(rand() % ( 5 * 1024 ) ) + 400; memset(randomstuff, 0, 6 * 1024); - assert(size < 6 * 1024); /* Being safe here */ + test_truth(size < 6 * 1024); /* Being safe here */ for (j= 0 ; j < size ;j++) randomstuff[j] = (signed char) ((rand() % 26) + 97); @@ -1872,12 +1894,12 @@ static test_return_t user_supplied_bug1(memcached_st *memc) sprintf(key, "%d", x); rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); /* If we fail, lets try again */ if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_BUFFERED) rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } return TEST_SUCCESS; @@ -1907,7 +1929,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++) { - memcached_return rc= MEMCACHED_SUCCESS; + memcached_return_t rc= MEMCACHED_SUCCESS; char buffer[SMALL_STRING_LEN]; uint32_t flags= 0; size_t val_len= 0; @@ -1924,7 +1946,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) errors++; else { - assert(rc); + test_truth(rc); } continue; @@ -1941,7 +1963,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) #define KEY_COUNT 3000 // * 1024576 static test_return_t user_supplied_bug3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int setter; unsigned int x; char **keys; @@ -1960,7 +1982,7 @@ static test_return_t user_supplied_bug3(memcached_st *memc) #endif keys= calloc(KEY_COUNT, sizeof(char *)); - assert(keys); + test_truth(keys); for (x= 0; x < KEY_COUNT; x++) { char buffer[30]; @@ -1971,9 +1993,9 @@ static test_return_t user_supplied_bug3(memcached_st *memc) } rc= memcached_mget(memc, (const char **)keys, key_lengths, KEY_COUNT); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - assert(fetch_all_results(memc) == TEST_SUCCESS); + test_truth(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < KEY_COUNT; x++) free(keys[x]); @@ -1985,7 +2007,7 @@ static test_return_t user_supplied_bug3(memcached_st *memc) /* Make sure we behave properly if server list has no values */ static test_return_t user_supplied_bug4(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -2005,39 +2027,39 @@ static test_return_t user_supplied_bug4(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); } - assert(!return_value); - assert(return_value_length == 0); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(!return_value); + test_truth(return_value_length == 0); + test_truth(rc == MEMCACHED_NO_SERVERS); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); x= 0; while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - assert(return_key_length == return_value_length); - assert(!memcmp(return_value, return_key, return_value_length)); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(return_key_length == return_value_length); + test_truth(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } @@ -2048,7 +2070,7 @@ static test_return_t user_supplied_bug4(memcached_st *memc) #define VALUE_SIZE_BUG5 1048064 static test_return_t user_supplied_bug5(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; @@ -2066,28 +2088,28 @@ static test_return_t user_supplied_bug5(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - assert(value == NULL); + test_truth(value == NULL); rc= memcached_mget(memc, keys, key_length, 4); count= 0; while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - assert(count == 0); + test_truth(count == 0); for (x= 0; x < 4; x++) { rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 10; x++) { value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - assert(value); + test_truth(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); @@ -2098,7 +2120,7 @@ static test_return_t user_supplied_bug5(memcached_st *memc) count++; free(value); } - assert(count == 4); + test_truth(count == 4); } return TEST_SUCCESS; @@ -2106,7 +2128,7 @@ static test_return_t user_supplied_bug5(memcached_st *memc) static test_return_t user_supplied_bug6(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; @@ -2124,44 +2146,44 @@ static test_return_t user_supplied_bug6(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - assert(value == NULL); - assert(rc == MEMCACHED_NOTFOUND); + test_truth(value == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); rc= memcached_mget(memc, keys, key_length, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); count= 0; while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - assert(count == 0); - assert(rc == MEMCACHED_END); + test_truth(count == 0); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 4; x++) { rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 2; x++) { value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - assert(value); + test_truth(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); count= 3; /* We test for purge of partial complete fetches */ for (count= 3; count; count--) { value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(!(memcmp(value, insert_data, value_length))); - assert(value_length); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(!(memcmp(value, insert_data, value_length))); + test_truth(value_length); free(value); } } @@ -2171,7 +2193,7 @@ static test_return_t user_supplied_bug6(memcached_st *memc) static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) { - memcached_return rc; + memcached_return_t rc; memcached_st *mine; memcached_st *memc_clone; @@ -2179,14 +2201,14 @@ static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unuse const char *server_list= "memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214"; servers= memcached_servers_parse(server_list); - assert(servers); + test_truth(servers); mine= memcached_create(NULL); rc= memcached_server_push(mine, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - assert(mine); + test_truth(mine); memc_clone= memcached_clone(NULL, mine); memcached_quit(mine); @@ -2202,7 +2224,7 @@ static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unuse /* Test flag store/retrieve */ static test_return_t user_supplied_bug7(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys= "036790384900"; size_t key_length= strlen(keys); char return_key[MEMCACHED_MAX_KEY]; @@ -2222,13 +2244,13 @@ static test_return_t user_supplied_bug7(memcached_st *memc) rc= memcached_set(memc, keys, key_length, insert_data, VALUE_SIZE_BUG5, (time_t)0, flags); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); flags= 0; value= memcached_get(memc, keys, key_length, &value_length, &flags, &rc); - assert(flags == 245); - assert(value); + test_truth(flags == 245); + test_truth(value); free(value); rc= memcached_mget(memc, &keys, &key_length, 1); @@ -2236,8 +2258,8 @@ static test_return_t user_supplied_bug7(memcached_st *memc) flags= 0; value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - assert(flags == 245); - assert(value); + test_truth(flags == 245); + test_truth(value); free(value); @@ -2246,7 +2268,7 @@ static test_return_t user_supplied_bug7(memcached_st *memc) static test_return_t user_supplied_bug9(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; size_t key_length[3]; unsigned int x; @@ -2269,21 +2291,21 @@ static test_return_t user_supplied_bug9(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* We need to empty the server before continueing test */ while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); free(return_value); count++; } - assert(count == 3); + test_truth(count == 3); return TEST_SUCCESS; } @@ -2296,7 +2318,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) size_t value_length= 512; unsigned int x; size_t key_len= 3; - memcached_return rc; + memcached_return_t rc; unsigned int set= 1; memcached_st *mclone= memcached_clone(NULL, memc); int32_t timeout; @@ -2316,7 +2338,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) { rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT); if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT) @@ -2339,7 +2361,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) size_t value_length= 512; unsigned int x; size_t key_len= 3; - memcached_return rc; + memcached_return_t rc; unsigned int set= 1; int32_t timeout; memcached_st *mclone= memcached_clone(NULL, memc); @@ -2352,7 +2374,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) timeout= (int32_t)memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); - assert(timeout == -1); + test_truth(timeout == -1); value = (char*)malloc(value_length * sizeof(char)); @@ -2375,7 +2397,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) */ static test_return_t user_supplied_bug12(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint32_t flags; size_t value_length; char *value; @@ -2383,31 +2405,35 @@ static test_return_t user_supplied_bug12(memcached_st *memc) value= memcached_get(memc, "autoincrement", strlen("autoincrement"), &value_length, &flags, &rc); - assert(value == NULL); - assert(rc == MEMCACHED_NOTFOUND); + test_truth(value == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - assert(value == NULL); + test_truth(value == NULL); /* The binary protocol will set the key if it doesn't exist */ if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) - assert(rc == MEMCACHED_SUCCESS); + { + test_truth(rc == MEMCACHED_SUCCESS); + } else - assert(rc == MEMCACHED_NOTFOUND); + { + test_truth(rc == MEMCACHED_NOTFOUND); + } rc= memcached_set(memc, "autoincrement", strlen("autoincrement"), "1", 1, 0, 0); value= memcached_get(memc, "autoincrement", strlen("autoincrement"), &value_length, &flags, &rc); - assert(value); - assert(rc == MEMCACHED_SUCCESS); + test_truth(value); + test_truth(rc == MEMCACHED_SUCCESS); free(value); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - assert(number_value == 2); - assert(rc == MEMCACHED_SUCCESS); + test_truth(number_value == 2); + test_truth(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } @@ -2420,7 +2446,7 @@ static test_return_t user_supplied_bug13(memcached_st *memc) { char key[] = "key34567890"; char *overflow; - memcached_return rc; + memcached_return_t rc; size_t overflowSize; char commandFirst[]= "set key34567890 0 0 "; @@ -2435,12 +2461,12 @@ static test_return_t user_supplied_bug13(memcached_st *memc) for (testSize= overflowSize - 1; testSize < overflowSize + 1; testSize++) { overflow= malloc(testSize); - assert(overflow != NULL); + test_truth(overflow != NULL); memset(overflow, 'x', testSize); rc= memcached_set(memc, key, strlen(key), overflow, testSize, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); free(overflow); } @@ -2458,7 +2484,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) { size_t setter= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter); - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 18000; @@ -2469,7 +2495,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) size_t current_length; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -2479,14 +2505,14 @@ static test_return_t user_supplied_bug14(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, current_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == current_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == current_length); + test_truth(!memcmp(string, value, string_length)); free(string); } @@ -2502,7 +2528,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) static test_return_t user_supplied_bug15(memcached_st *memc) { uint32_t x; - memcached_return rc; + memcached_return_t rc; const char *key= "mykey"; char *value; size_t length; @@ -2514,23 +2540,23 @@ static test_return_t user_supplied_bug15(memcached_st *memc) NULL, 0, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == 0); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == 0); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == 0); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == 0); } return TEST_SUCCESS; @@ -2539,7 +2565,7 @@ static test_return_t user_supplied_bug15(memcached_st *memc) /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */ static test_return_t user_supplied_bug16(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "mykey"; char *value; size_t length; @@ -2549,15 +2575,15 @@ static test_return_t user_supplied_bug16(memcached_st *memc) NULL, 0, (time_t)0, UINT32_MAX); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == UINT32_MAX); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == UINT32_MAX); return TEST_SUCCESS; } @@ -2566,7 +2592,7 @@ static test_return_t user_supplied_bug16(memcached_st *memc) /* Check the validity of chinese key*/ static test_return_t user_supplied_bug17(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "豆瓣"; const char *value="我们在炎热抑郁的夏天无法停止豆瓣"; char *value2; @@ -2577,14 +2603,14 @@ static test_return_t user_supplied_bug17(memcached_st *memc) value, strlen(value), (time_t)0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value2= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(length==strlen(value)); - assert(rc == MEMCACHED_SUCCESS); - assert(memcmp(value, value2, length)==0); + test_truth(length==strlen(value)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcmp(value, value2, length)==0); free(value2); return TEST_SUCCESS; @@ -2599,7 +2625,7 @@ static test_return_t user_supplied_bug19(memcached_st *memc) { memcached_st *m; memcached_server_st *s; - memcached_return res; + memcached_return_t res; (void)memc; @@ -2618,7 +2644,7 @@ static test_return_t user_supplied_bug19(memcached_st *memc) /* CAS test from Andei */ static test_return_t user_supplied_bug20(memcached_st *memc) { - memcached_return status; + memcached_return_t status; memcached_result_st *result, result_obj; const char *key = "abc"; size_t key_len = strlen("abc"); @@ -2628,19 +2654,19 @@ static test_return_t user_supplied_bug20(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); status = memcached_set(memc, key, key_len, value, value_len, (time_t)0, (uint32_t)0); - assert(status == MEMCACHED_SUCCESS); + test_truth(status == MEMCACHED_SUCCESS); status = memcached_mget(memc, &key, &key_len, 1); - assert(status == MEMCACHED_SUCCESS); + test_truth(status == MEMCACHED_SUCCESS); result= memcached_result_create(memc, &result_obj); - assert(result); + test_truth(result); memcached_result_create(memc, &result_obj); result= memcached_fetch_result(memc, &result_obj, &status); - assert(result); - assert(status == MEMCACHED_SUCCESS); + test_truth(result); + test_truth(status == MEMCACHED_SUCCESS); memcached_result_free(result); @@ -2650,7 +2676,7 @@ static test_return_t user_supplied_bug20(memcached_st *memc) #include "ketama_test_cases.h" static test_return_t user_supplied_bug18(memcached_st *trash) { - memcached_return rc; + memcached_return_t rc; uint64_t value; int x; memcached_server_st *server_pool; @@ -2659,46 +2685,46 @@ static test_return_t user_supplied_bug18(memcached_st *trash) (void)trash; memc= memcached_create(NULL); - assert(memc); + test_truth(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - assert(value == 1); + test_truth(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); server_pool = memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); memcached_server_push(memc, server_pool); /* verify that the server list was parsed okay. */ - assert(memc->number_of_hosts == 8); - assert(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); - assert(server_pool[0].port == 11211); - assert(server_pool[0].weight == 600); - assert(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); - assert(server_pool[2].port == 11211); - assert(server_pool[2].weight == 200); - assert(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); - assert(server_pool[7].port == 11211); - assert(server_pool[7].weight == 100); + test_truth(memc->number_of_hosts == 8); + test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_truth(server_pool[0].port == 11211); + test_truth(server_pool[0].weight == 600); + test_truth(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_truth(server_pool[2].port == 11211); + test_truth(server_pool[2].weight == 200); + test_truth(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_truth(server_pool[7].port == 11211); + test_truth(server_pool[7].weight == 100); /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets * us test the boundary wraparound. */ - assert(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + test_truth(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); /* verify the standard ketama set. */ for (x= 0; x < 99; x++) { uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); char *hostname = memc->hosts[server_idx].hostname; - assert(strcmp(hostname, ketama_test_cases[x].server) == 0); + test_truth(strcmp(hostname, ketama_test_cases[x].server) == 0); } memcached_server_list_free(server_pool); @@ -2723,7 +2749,7 @@ static void fail(int unused __attribute__((unused))) static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) { - memcached_return rc; + memcached_return_t rc; unsigned int x; char **keys; size_t* key_lengths; @@ -2731,18 +2757,18 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); + test_truth(memc_clone); /* only binproto uses getq for mget */ memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); /* empty the cache to ensure misses (hence non-responses) */ rc= memcached_flush(memc_clone, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); key_lengths= calloc(key_count, sizeof(size_t)); keys= calloc(key_count, sizeof(char *)); - assert(keys); + test_truth(keys); for (x= 0; x < key_count; x++) { char buffer[30]; @@ -2756,12 +2782,12 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) alarm(5); rc= memcached_mget(memc_clone, (const char **)keys, key_lengths, key_count); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); alarm(0); signal(SIGALRM, oldalarm); - assert(fetch_all_results(memc) == TEST_SUCCESS); + test_truth(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < key_count; x++) free(keys[x]); @@ -2773,7 +2799,7 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) return TEST_SUCCESS; } -static memcached_return pre_binary(memcached_st *memc); +static memcached_return_t pre_binary(memcached_st *memc); static test_return_t user_supplied_bug21(memcached_st *memc) { @@ -2784,11 +2810,11 @@ static test_return_t user_supplied_bug21(memcached_st *memc) /* should work as of r580 */ rc= _user_supplied_bug21(memc, 10); - assert(rc == TEST_SUCCESS); + test_truth(rc == TEST_SUCCESS); /* should fail as of r580 */ rc= _user_supplied_bug21(memc, 1000); - assert(rc == TEST_SUCCESS); + test_truth(rc == TEST_SUCCESS); return TEST_SUCCESS; } @@ -2797,44 +2823,44 @@ static test_return_t auto_eject_hosts(memcached_st *trash) { (void) trash; - memcached_return rc; + memcached_return_t rc; memcached_st *memc= memcached_create(NULL); - assert(memc); + test_truth(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - assert(value == 1); + test_truth(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); /* server should be removed when in delay */ rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS); - assert(value == 1); + test_truth(value == 1); memcached_server_st *server_pool; server_pool = memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); memcached_server_push(memc, server_pool); /* verify that the server list was parsed okay. */ - assert(memc->number_of_hosts == 8); - assert(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); - assert(server_pool[0].port == 11211); - assert(server_pool[0].weight == 600); - assert(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); - assert(server_pool[2].port == 11211); - assert(server_pool[2].weight == 200); - assert(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); - assert(server_pool[7].port == 11211); - assert(server_pool[7].weight == 100); + test_truth(memc->number_of_hosts == 8); + test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_truth(server_pool[0].port == 11211); + test_truth(server_pool[0].weight == 600); + test_truth(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_truth(server_pool[2].port == 11211); + test_truth(server_pool[2].weight == 200); + test_truth(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_truth(server_pool[7].port == 11211); + test_truth(server_pool[7].weight == 100); memc->hosts[2].next_retry = time(NULL) + 15; memc->next_distribution_rebuild= time(NULL) - 1; @@ -2842,7 +2868,7 @@ static test_return_t auto_eject_hosts(memcached_st *trash) for (int x= 0; x < 99; x++) { uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - assert(server_idx != 2); + test_truth(server_idx != 2); } /* and re-added when it's back. */ @@ -2854,7 +2880,7 @@ static test_return_t auto_eject_hosts(memcached_st *trash) { uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); char *hostname = memc->hosts[server_idx].hostname; - assert(strcmp(hostname, ketama_test_cases[x].server) == 0); + test_truth(strcmp(hostname, ketama_test_cases[x].server) == 0); } memcached_server_list_free(server_pool); @@ -2867,25 +2893,25 @@ static test_return_t output_ketama_weighted_keys(memcached_st *trash) { (void) trash; - memcached_return rc; + memcached_return_t rc; memcached_st *memc= memcached_create(NULL); - assert(memc); + test_truth(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - assert(value == 1); + test_truth(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); - assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE, + test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE, MEMCACHED_KETAMA_COMPAT_SPY) == MEMCACHED_SUCCESS); memcached_server_st *server_pool; @@ -2925,20 +2951,28 @@ static test_return_t result_static(memcached_st *memc) memcached_result_st *result_ptr; result_ptr= memcached_result_create(memc, &result); - assert(result.is_allocated == false); - assert(result_ptr); + test_truth(result.options.is_allocated == false); + test_truth(memcached_is_initialized(&result) == true); + test_truth(result_ptr); + test_truth(result_ptr == &result); + memcached_result_free(&result); + test_truth(result.options.is_allocated == false); + test_truth(memcached_is_initialized(&result) == false); + return TEST_SUCCESS; } static test_return_t result_alloc(memcached_st *memc) { - memcached_result_st *result; + memcached_result_st *result_ptr; - result= memcached_result_create(memc, NULL); - assert(result); - memcached_result_free(result); + result_ptr= memcached_result_create(memc, NULL); + test_truth(result_ptr); + test_truth(result_ptr->options.is_allocated == true); + test_truth(memcached_is_initialized(result_ptr) == true); + memcached_result_free(result_ptr); return TEST_SUCCESS; } @@ -2949,9 +2983,18 @@ static test_return_t string_static_null(memcached_st *memc) memcached_string_st *string_ptr; string_ptr= memcached_string_create(memc, &string, 0); - assert(string.is_allocated == false); - assert(string_ptr); + test_truth(string.options.is_initialized == true); + test_truth(string_ptr); + + /* The following two better be the same! */ + test_truth(memcached_is_allocated(string_ptr) == false); + test_truth(memcached_is_allocated(&string) == false); + test_truth(&string == string_ptr); + + test_truth(string.options.is_initialized == true); + test_truth(memcached_is_initialized(&string) == true); memcached_string_free(&string); + test_truth(memcached_is_initialized(&string) == false); return TEST_SUCCESS; } @@ -2961,7 +3004,9 @@ static test_return_t string_alloc_null(memcached_st *memc) memcached_string_st *string; string= memcached_string_create(memc, NULL, 0); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); memcached_string_free(string); return TEST_SUCCESS; @@ -2972,7 +3017,9 @@ static test_return_t string_alloc_with_size(memcached_st *memc) memcached_string_st *string; string= memcached_string_create(memc, NULL, 1024); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); memcached_string_free(string); return TEST_SUCCESS; @@ -2983,7 +3030,7 @@ static test_return_t string_alloc_with_size_toobig(memcached_st *memc) memcached_string_st *string; string= memcached_string_create(memc, NULL, SIZE_MAX); - assert(string == NULL); + test_truth(string == NULL); return TEST_SUCCESS; } @@ -2998,14 +3045,17 @@ static test_return_t string_alloc_append(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { - memcached_return rc; + memcached_return_t rc; rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } + test_truth(memcached_is_allocated(string) == true); memcached_string_free(string); return TEST_SUCCESS; @@ -3013,7 +3063,7 @@ static test_return_t string_alloc_append(memcached_st *memc) static test_return_t string_alloc_append_toobig(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int x; char buffer[SMALL_STRING_LEN]; memcached_string_st *string; @@ -3022,15 +3072,18 @@ static test_return_t string_alloc_append_toobig(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_string_append(string, buffer, SIZE_MAX); - assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); + test_truth(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); + test_truth(memcached_is_allocated(string) == true); memcached_string_free(string); return TEST_SUCCESS; @@ -3083,13 +3136,13 @@ static test_return_t generate_data(memcached_st *memc) static test_return_t generate_data_with_stats(memcached_st *memc) { memcached_stat_st *stat_p; - memcached_return rc; + memcached_return_t rc; uint32_t host_index= 0; execute_set(memc, global_pairs, global_count); //TODO: hosts used size stats stat_p= memcached_stat(memc, NULL, &rc); - assert(stat_p); + test_truth(stat_p); for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++) { @@ -3097,7 +3150,7 @@ static test_return_t generate_data_with_stats(memcached_st *memc) #ifdef DEBUG printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes); #endif - assert((unsigned long long)(stat_p + host_index)->bytes); + test_truth((unsigned long long)(stat_p + host_index)->bytes); } memcached_stat_free(NULL, stat_p); @@ -3118,11 +3171,11 @@ static test_return_t generate_buffer_data(memcached_st *memc) static test_return_t get_read_count(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); + test_truth(memc_clone); memcached_server_add_with_weight(memc_clone, "localhost", 6666, 0); @@ -3153,7 +3206,7 @@ static test_return_t get_read_count(memcached_st *memc) static test_return_t get_read(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; { char *return_value; @@ -3165,8 +3218,8 @@ static test_return_t get_read(memcached_st *memc) return_value= memcached_get(memc, global_keys[x], global_keys_length[x], &return_value_length, &flags, &rc); /* - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); */ if (rc == MEMCACHED_SUCCESS && return_value) free(return_value); @@ -3178,21 +3231,21 @@ static test_return_t get_read(memcached_st *memc) static test_return_t mget_read(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); - assert(fetch_all_results(memc) == TEST_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(fetch_all_results(memc) == TEST_SUCCESS); return TEST_SUCCESS; } static test_return_t mget_read_result(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* Turn this into a help function */ { memcached_result_st results_obj; @@ -3202,8 +3255,8 @@ static test_return_t mget_read_result(memcached_st *memc) while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - assert(results); - assert(rc == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); } memcached_result_free(&results_obj); @@ -3214,12 +3267,12 @@ static test_return_t mget_read_result(memcached_st *memc) static test_return_t mget_read_function(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int counter; - memcached_execute_function callbacks[1]; + memcached_execute_fn callbacks[1]; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; @@ -3259,13 +3312,13 @@ static test_return_t delete_buffer_generate(memcached_st *memc) static test_return_t add_host_test1(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; char servername[]= "0.example.com"; memcached_server_st *servers; servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - assert(servers); - assert(1 == memcached_server_list_count(servers)); + test_truth(servers); + test_truth(1 == memcached_server_list_count(servers)); for (x= 2; x < 20; x++) { @@ -3274,30 +3327,30 @@ static test_return_t add_host_test1(memcached_st *memc) snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(x == memcached_server_list_count(servers)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); return TEST_SUCCESS; } -static memcached_return pre_nonblock(memcached_st *memc) +static memcached_return_t pre_nonblock(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); return MEMCACHED_SUCCESS; } -static memcached_return pre_nonblock_binary(memcached_st *memc) +static memcached_return_t pre_nonblock_binary(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; + memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); @@ -3318,14 +3371,14 @@ static memcached_return pre_nonblock_binary(memcached_st *memc) return rc; } -static memcached_return pre_murmur(memcached_st *memc) +static memcached_return_t pre_murmur(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR); return MEMCACHED_SUCCESS; } -static memcached_return pre_jenkins(memcached_st *memc) +static memcached_return_t pre_jenkins(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS); @@ -3333,21 +3386,21 @@ static memcached_return pre_jenkins(memcached_st *memc) } -static memcached_return pre_md5(memcached_st *memc) +static memcached_return_t pre_md5(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5); return MEMCACHED_SUCCESS; } -static memcached_return pre_crc(memcached_st *memc) +static memcached_return_t pre_crc(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_CRC); return MEMCACHED_SUCCESS; } -static memcached_return pre_hsieh(memcached_st *memc) +static memcached_return_t pre_hsieh(memcached_st *memc) { #ifdef HAVE_HSIEH_HASH memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); @@ -3358,37 +3411,37 @@ static memcached_return pre_hsieh(memcached_st *memc) #endif } -static memcached_return pre_hash_fnv1_64(memcached_st *memc) +static memcached_return_t pre_hash_fnv1_64(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_64); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1a_64(memcached_st *memc) +static memcached_return_t pre_hash_fnv1a_64(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_64); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1_32(memcached_st *memc) +static memcached_return_t pre_hash_fnv1_32(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_32); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1a_32(memcached_st *memc) +static memcached_return_t pre_hash_fnv1a_32(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_32); return MEMCACHED_SUCCESS; } -static memcached_return pre_behavior_ketama(memcached_st *memc) +static memcached_return_t pre_behavior_ketama(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1); @@ -3400,9 +3453,9 @@ static memcached_return pre_behavior_ketama(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_behavior_ketama_weighted(memcached_st *memc) +static memcached_return_t pre_behavior_ketama_weighted(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); @@ -3419,9 +3472,9 @@ static memcached_return pre_behavior_ketama_weighted(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_binary(memcached_st *memc) +static memcached_return_t pre_binary(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; + memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); @@ -3442,7 +3495,7 @@ static memcached_return pre_binary(memcached_st *memc) return rc; } -static memcached_return pre_replication(memcached_st *memc) +static memcached_return_t pre_replication(memcached_st *memc) { if (pre_binary(memc) != MEMCACHED_SUCCESS) return MEMCACHED_FAILURE; @@ -3451,7 +3504,7 @@ static memcached_return pre_replication(memcached_st *memc) * Make sure that we store the item on all servers * (master + replicas == number of servers) */ - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, memc->number_of_hosts - 1); assert(rc == MEMCACHED_SUCCESS); @@ -3460,9 +3513,9 @@ static memcached_return pre_replication(memcached_st *memc) return rc; } -static memcached_return pre_replication_noblock(memcached_st *memc) +static memcached_return_t pre_replication_noblock(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; + memcached_return_t rc= MEMCACHED_FAILURE; if (pre_replication(memc) == MEMCACHED_SUCCESS && pre_nonblock(memc) == MEMCACHED_SUCCESS) rc= MEMCACHED_SUCCESS; @@ -3494,9 +3547,9 @@ static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, return calloc(nelem, size); } -static memcached_return set_prefix(memcached_st *memc) +static memcached_return_t set_prefix(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "mine"; char *value; @@ -3564,15 +3617,15 @@ static memcached_return set_prefix(memcached_st *memc) } #ifdef MEMCACHED_ENABLE_DEPRECATED -static memcached_return deprecated_set_memory_alloc(memcached_st *memc) +static memcached_return_t deprecated_set_memory_alloc(memcached_st *memc) { void *test_ptr= NULL; void *cb_ptr= NULL; { - memcached_malloc_function malloc_cb= - (memcached_malloc_function)my_malloc; + memcached_malloc_fn malloc_cb= + (memcached_malloc_fn)my_malloc; cb_ptr= *(void **)&malloc_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3582,10 +3635,10 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_realloc_function realloc_cb= - (memcached_realloc_function)my_realloc; + memcached_realloc_fn realloc_cb= + (memcached_realloc_fn)my_realloc; cb_ptr= *(void **)&realloc_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3595,10 +3648,10 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_free_function free_cb= - (memcached_free_function)my_free; + memcached_free_fn free_cb= + (memcached_free_fn)my_free; cb_ptr= *(void **)&free_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3610,9 +3663,9 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } #endif -static memcached_return set_memory_alloc(memcached_st *memc) +static memcached_return_t set_memory_alloc(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_set_memory_allocators(memc, NULL, my_free, my_realloc, my_calloc); assert(rc == MEMCACHED_FAILURE); @@ -3620,10 +3673,10 @@ static memcached_return set_memory_alloc(memcached_st *memc) rc= memcached_set_memory_allocators(memc, my_malloc, my_free, my_realloc, my_calloc); - memcached_malloc_function mem_malloc; - memcached_free_function mem_free; - memcached_realloc_function mem_realloc; - memcached_calloc_function mem_calloc; + memcached_malloc_fn mem_malloc; + memcached_free_fn mem_free; + memcached_realloc_fn mem_realloc; + memcached_calloc_fn mem_calloc; memcached_get_memory_allocators(memc, &mem_malloc, &mem_free, &mem_realloc, &mem_calloc); @@ -3635,25 +3688,25 @@ static memcached_return set_memory_alloc(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return enable_consistent(memcached_st *memc) +static memcached_return_t enable_consistent(memcached_st *memc) { - memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT; - memcached_hash hash; + memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; + memcached_hash_t hash; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); if (pre_hsieh(memc) != MEMCACHED_SUCCESS) return MEMCACHED_FAILURE; - value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); + value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT); - hash= (memcached_hash)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); + hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); assert(hash == MEMCACHED_HASH_HSIEH); return MEMCACHED_SUCCESS; } -static memcached_return enable_cas(memcached_st *memc) +static memcached_return_t enable_cas(memcached_st *memc) { unsigned int set= 1; @@ -3670,7 +3723,7 @@ static memcached_return enable_cas(memcached_st *memc) return MEMCACHED_FAILURE; } -static memcached_return check_for_1_2_3(memcached_st *memc) +static memcached_return_t check_for_1_2_3(memcached_st *memc) { memcached_version(memc); @@ -3681,9 +3734,9 @@ static memcached_return check_for_1_2_3(memcached_st *memc) return MEMCACHED_FAILURE; } -static memcached_return pre_unix_socket(memcached_st *memc) +static memcached_return_t pre_unix_socket(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; struct stat buf; memcached_server_list_free(memc->hosts); @@ -3698,7 +3751,7 @@ static memcached_return pre_unix_socket(memcached_st *memc) return rc; } -static memcached_return pre_nodelay(memcached_st *memc) +static memcached_return_t pre_nodelay(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 0); @@ -3706,7 +3759,7 @@ static memcached_return pre_nodelay(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_settimer(memcached_st *memc) +static memcached_return_t pre_settimer(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000); @@ -3714,7 +3767,7 @@ static memcached_return pre_settimer(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return poll_timeout(memcached_st *memc) +static memcached_return_t poll_timeout(memcached_st *memc) { size_t timeout; @@ -3731,16 +3784,16 @@ static memcached_return poll_timeout(memcached_st *memc) static test_return_t noreply_test(memcached_st *memc) { - memcached_return ret; + memcached_return_t ret; ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); - assert(ret == MEMCACHED_SUCCESS); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY) == 1); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1); + test_truth(ret == MEMCACHED_SUCCESS); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY) == 1); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1); for (int count=0; count < 5; ++count) { @@ -3766,10 +3819,10 @@ static test_return_t noreply_test(memcached_st *memc) ret=memcached_prepend(memc, key, len, key, len, 0, 0); break; default: - assert(count); + test_truth(count); break; } - assert(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); + test_truth(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); } /* @@ -3781,8 +3834,8 @@ static test_return_t noreply_test(memcached_st *memc) for (uint32_t x=0; x < memc->number_of_hosts; ++x) no_msg+=(int)(memc->hosts[x].cursor_active); - assert(no_msg == 0); - assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_truth(no_msg == 0); + test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); /* ** Now validate that all items was set properly! @@ -3795,23 +3848,23 @@ static test_return_t noreply_test(memcached_st *memc) uint32_t flags; char* value=memcached_get(memc, key, strlen(key), &length, &flags, &ret); - assert(ret == MEMCACHED_SUCCESS && value != NULL); + test_truth(ret == MEMCACHED_SUCCESS && value != NULL); switch (count) { case 0: /* FALLTHROUGH */ case 1: /* FALLTHROUGH */ case 2: - assert(strncmp(value, key, len) == 0); - assert(len == length); + test_truth(strncmp(value, key, len) == 0); + test_truth(len == length); break; case 3: - assert(length == len * 2); + test_truth(length == len * 2); break; case 4: - assert(length == len * 3); + test_truth(length == len * 3); break; default: - assert(count); + test_truth(count); break; } free(value); @@ -3828,28 +3881,28 @@ static test_return_t noreply_test(memcached_st *memc) memcached_result_st results_obj; memcached_result_st *results; ret= memcached_mget(memc, keys, lengths, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); results= memcached_result_create(memc, &results_obj); - assert(results); + test_truth(results); results= memcached_fetch_result(memc, &results_obj, &ret); - assert(results); - assert(ret == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(ret == MEMCACHED_SUCCESS); uint64_t cas= memcached_result_cas(results); memcached_result_free(&results_obj); ret= memcached_cas(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0, cas); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); /* * The item will have a new cas value, so try to set it again with the old * value. This should fail! */ ret= memcached_cas(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0, cas); - assert(ret == MEMCACHED_SUCCESS); - assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); + test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); char* value=memcached_get(memc, keys[0], lengths[0], &length, &flags, &ret); - assert(ret == MEMCACHED_SUCCESS && value != NULL); + test_truth(ret == MEMCACHED_SUCCESS && value != NULL); free(value); return TEST_SUCCESS; @@ -3857,17 +3910,17 @@ static test_return_t noreply_test(memcached_st *memc) static test_return_t analyzer_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st *memc_stat; memcached_analysis_st *report; memc_stat= memcached_stat(memc, NULL, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(memc_stat); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memc_stat); report= memcached_analyze(memc, memc_stat, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(report); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(report); free(report); memcached_stat_free(NULL, memc_stat); @@ -3876,7 +3929,7 @@ static test_return_t analyzer_test(memcached_st *memc) } /* Count the objects */ -static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((unused)), +static memcached_return_t callback_dump_counter(memcached_st *ptr __attribute__((unused)), const char *key __attribute__((unused)), size_t key_length __attribute__((unused)), void *context) @@ -3890,32 +3943,33 @@ static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((u static test_return_t dump_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint32_t counter= 0; - memcached_dump_func callbacks[1]; + memcached_dump_fn callbacks[1]; test_return_t main_rc; callbacks[0]= &callback_dump_counter; /* No support for Binary protocol yet */ - if (memc->flags & MEM_BINARY_PROTOCOL) + if (memc->flags.binary_protocol) return TEST_SUCCESS; main_rc= set_test3(memc); - assert (main_rc == TEST_SUCCESS); + test_truth (main_rc == TEST_SUCCESS); rc= memcached_dump(memc, callbacks, (void *)&counter, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* We may have more then 32 if our previous flush has not completed */ - assert(counter >= 32); + test_truth(counter >= 32); return TEST_SUCCESS; } #ifdef HAVE_LIBMEMCACHEDUTIL -static void* connection_release(void *arg) { +static void* connection_release(void *arg) +{ struct { memcached_pool_st* pool; memcached_st* mmc; @@ -3929,18 +3983,18 @@ static void* connection_release(void *arg) { static test_return_t connection_pool_test(memcached_st *memc) { memcached_pool_st* pool= memcached_pool_create(memc, 5, 10); - assert(pool != NULL); + test_truth(pool != NULL); memcached_st* mmc[10]; - memcached_return rc; + memcached_return_t rc; for (int x= 0; x < 10; ++x) { mmc[x]= memcached_pool_pop(pool, false, &rc); - assert(mmc[x] != NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(mmc[x] != NULL); + test_truth(rc == MEMCACHED_SUCCESS); } - assert(memcached_pool_pop(pool, false, &rc) == NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(memcached_pool_pop(pool, false, &rc) == NULL); + test_truth(rc == MEMCACHED_SUCCESS); pthread_t tid; struct { @@ -3949,26 +4003,26 @@ static test_return_t connection_pool_test(memcached_st *memc) } item= { .pool = pool, .mmc = mmc[9] }; pthread_create(&tid, NULL, connection_release, &item); mmc[9]= memcached_pool_pop(pool, true, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); pthread_join(tid, NULL); - assert(mmc[9] == item.mmc); + test_truth(mmc[9] == item.mmc); const char *key= "key"; size_t keylen= strlen(key); // verify that I can do ops with all connections rc= memcached_set(mmc[0], key, keylen, "0", 1, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (unsigned int x= 0; x < 10; ++x) { uint64_t number_value; rc= memcached_increment(mmc[x], key, keylen, 1, &number_value); - assert(rc == MEMCACHED_SUCCESS); - assert(number_value == (x+1)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(number_value == (x+1)); } // Release them.. for (int x= 0; x < 10; ++x) - assert(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + test_truth(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); /* verify that I can set behaviors on the pool when I don't have all @@ -3976,36 +4030,36 @@ static test_return_t connection_pool_test(memcached_st *memc) * when I push the item into the pool */ mmc[0]= memcached_pool_pop(pool, false, &rc); - assert(mmc[0] != NULL); + test_truth(mmc[0] != NULL); rc= memcached_pool_behavior_set(pool, MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, 9999); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); mmc[1]= memcached_pool_pop(pool, false, &rc); - assert(mmc[1] != NULL); + test_truth(mmc[1] != NULL); - assert(memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); - assert(memcached_pool_push(pool, mmc[1]) == MEMCACHED_SUCCESS); - assert(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + test_truth(memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_truth(memcached_pool_push(pool, mmc[1]) == MEMCACHED_SUCCESS); + test_truth(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); mmc[0]= memcached_pool_pop(pool, false, &rc); - assert(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); - assert(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + test_truth(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_truth(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); - assert(memcached_pool_destroy(pool) == memc); + test_truth(memcached_pool_destroy(pool) == memc); return TEST_SUCCESS; } #endif static test_return_t replication_set_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); rc= memcached_set(memc, "bubba", 5, "0", 1, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* ** We are using the quiet commands to store the replicas, so we need @@ -4035,8 +4089,8 @@ static test_return_t replication_set_test(memcached_st *memc) uint32_t flags; char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); free(val); } @@ -4047,7 +4101,7 @@ static test_return_t replication_set_test(memcached_st *memc) static test_return_t replication_get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; /* * Don't do the following in your code. I am abusing the internal details @@ -4066,8 +4120,8 @@ static test_return_t replication_get_test(memcached_st *memc) uint32_t flags; char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); free(val); } @@ -4079,7 +4133,7 @@ static test_return_t replication_get_test(memcached_st *memc) static test_return_t replication_mget_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); @@ -4089,7 +4143,7 @@ static test_return_t replication_mget_test(memcached_st *memc) for (int x=0; x< 4; ++x) { rc= memcached_set(memc, keys[x], len[x], "0", 1, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } /* @@ -4123,17 +4177,17 @@ static test_return_t replication_mget_test(memcached_st *memc) const char key[2]= { [0]= (const char)x }; rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(new_clone, &result_obj); - assert(results); + test_truth(results); int hits= 0; while ((results= memcached_fetch_result(new_clone, &result_obj, &rc)) != NULL) { hits++; } - assert(hits == 4); + test_truth(hits == 4); memcached_result_free(&result_obj); } @@ -4145,9 +4199,49 @@ static test_return_t replication_mget_test(memcached_st *memc) return TEST_SUCCESS; } +static test_return_t replication_randomize_mget_test(memcached_st *memc) +{ + memcached_result_st result_obj; + memcached_return_t rc; + memcached_st *memc_clone= memcached_clone(NULL, memc); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 3); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ, 1); + + const char *keys[]= { "key1", "key2", "key3", "key4", "key5", "key6", "key7" }; + size_t len[]= { 4, 4, 4, 4, 4, 4, 4 }; + + for (int x=0; x< 7; ++x) + { + rc= memcached_set(memc, keys[x], len[x], "1", 1, 0, 0); + test_truth(rc == MEMCACHED_SUCCESS); + } + + memcached_quit(memc); + + for (int x=0; x< 7; ++x) { + const char key[2]= { [0]= (const char)x }; + + rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 7); + test_truth(rc == MEMCACHED_SUCCESS); + + memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); + test_truth(results); + + int hits= 0; + while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) + { + ++hits; + } + test_truth(hits == 7); + memcached_result_free(&result_obj); + } + memcached_free(memc_clone); + return TEST_SUCCESS; +} + static test_return_t replication_delete_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); /* Delete the items from all of the servers except 1 */ uint64_t repl= memcached_behavior_get(memc, @@ -4160,7 +4254,7 @@ static test_return_t replication_delete_test(memcached_st *memc) for (int x=0; x< 4; ++x) { rc= memcached_delete_by_key(memc, keys[0], len[0], keys[x], len[x], 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } /* @@ -4184,17 +4278,17 @@ static test_return_t replication_delete_test(memcached_st *memc) const char key[2]= { [0]= (const char)x }; rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); - assert(results); + test_truth(results); int hits= 0; while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) { ++hits; } - assert(hits == 4); + test_truth(hits == 4); memcached_result_free(&result_obj); } } @@ -4230,8 +4324,8 @@ static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_re for (x= 0; x < memc->number_of_hosts; x++) { - assert(cur_server[x].cursor_active == 0); - assert(cur_req_ids[x] == expected_req_ids[x]); + test_truth(cur_server[x].cursor_active == 0); + test_truth(cur_req_ids[x] == expected_req_ids[x]); } free(expected_req_ids); free(cur_req_ids); @@ -4243,7 +4337,7 @@ static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_re ** There is a little bit of a hack here, instead of removing ** the servers, I just set num host to 0 and them add then new udp servers **/ -static memcached_return init_udp(memcached_st *memc) +static memcached_return_t init_udp(memcached_st *memc) { memcached_version(memc); /* For the time being, only support udp test for >= 1.2.6 && < 1.3 */ @@ -4269,7 +4363,7 @@ static memcached_return init_udp(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return binary_init_udp(memcached_st *memc) +static memcached_return_t binary_init_udp(memcached_st *memc) { pre_binary(memc); return init_udp(memc); @@ -4280,8 +4374,8 @@ static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); - assert(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - assert(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); + test_truth(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); return TEST_SUCCESS; } @@ -4290,11 +4384,12 @@ static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); - assert(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); + test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); memcached_st tcp_client; memcached_create(&tcp_client); - assert(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + test_truth(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + return TEST_SUCCESS; } @@ -4304,16 +4399,17 @@ static test_return_t set_udp_behavior_test(memcached_st *memc) memcached_quit(memc); memc->number_of_hosts= 0; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution); - assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); - assert(memc->flags & MEM_USE_UDP); - assert(memc->flags & MEM_NOREPLY);; + test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); + test_truth(memc->flags.use_udp); + test_truth(memc->flags.no_reply); - assert(memc->number_of_hosts == 0); + test_truth(memc->number_of_hosts == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0); - assert(!(memc->flags & MEM_USE_UDP)); + test_truth(! (memc->flags.use_udp)); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0); - assert(!(memc->flags & MEM_NOREPLY)); + test_truth(! (memc->flags.no_reply)); + return TEST_SUCCESS; } @@ -4323,7 +4419,7 @@ static test_return_t udp_set_test(memcached_st *memc) unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; uint16_t *expected_ids= get_udp_request_ids(memc); @@ -4332,7 +4428,7 @@ static test_return_t udp_set_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); /** NB, the check below assumes that if new write_ptr is less than * the original write_ptr that we have flushed. For large payloads, this * maybe an invalid assumption, but for the small payload we have it is OK @@ -4343,14 +4439,14 @@ static test_return_t udp_set_test(memcached_st *memc) if (rc == MEMCACHED_SUCCESS) { - assert(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); } else { - assert(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - assert(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); } - assert(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); + test_truth(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); } return TEST_SUCCESS; } @@ -4363,14 +4459,14 @@ static test_return_t udp_buffered_set_test(memcached_st *memc) static test_return_t udp_set_too_big_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "bar"; char value[MAX_UDP_DATAGRAM_LENGTH]; uint16_t *expected_ids= get_udp_request_ids(memc); rc= memcached_set(memc, key, strlen(key), value, MAX_UDP_DATAGRAM_LENGTH, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_WRITE_FAILURE); + test_truth(rc == MEMCACHED_WRITE_FAILURE); return post_udp_op_check(memc,expected_ids); } @@ -4380,23 +4476,25 @@ static test_return_t udp_delete_test(memcached_st *memc) unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; uint16_t *expected_ids=get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); size_t init_offset= memc->hosts[server_key].write_buffer_offset; rc= memcached_delete(memc, key, strlen(key), 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); if (rc == MEMCACHED_SUCCESS || memc->hosts[server_key].write_buffer_offset < init_offset) increment_request_id(&expected_ids[server_key]); if (rc == MEMCACHED_SUCCESS) - assert(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + { + test_truth(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + } else { - assert(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - assert(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); } - assert(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); + test_truth(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); } return TEST_SUCCESS; } @@ -4409,14 +4507,14 @@ static test_return_t udp_buffered_delete_test(memcached_st *memc) static test_return_t udp_verbosity_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int x; for (x= 0; x < memc->number_of_hosts;x++) increment_request_id(&expected_ids[x]); rc= memcached_verbosity(memc,3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc,expected_ids); } @@ -4429,52 +4527,52 @@ static test_return_t udp_quit_test(memcached_st *memc) static test_return_t udp_flush_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int x; for (x= 0; x < memc->number_of_hosts;x++) increment_request_id(&expected_ids[x]); rc= memcached_flush(memc,0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc,expected_ids); } static test_return_t udp_incr_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "incr"; const char *value= "1"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); increment_request_id(&expected_ids[server_key]); uint64_t newvalue; rc= memcached_increment(memc, key, strlen(key), 1, &newvalue); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc, expected_ids); } static test_return_t udp_decr_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "decr"; const char *value= "1"; rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); increment_request_id(&expected_ids[server_key]); uint64_t newvalue; rc= memcached_decrement(memc, key, strlen(key), 1, &newvalue); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc, expected_ids); } @@ -4482,33 +4580,33 @@ static test_return_t udp_decr_test(memcached_st *memc) static test_return_t udp_stat_test(memcached_st *memc) { memcached_stat_st * rv= NULL; - memcached_return rc; + memcached_return_t rc; char args[]= ""; uint16_t *expected_ids = get_udp_request_ids(memc); rv = memcached_stat(memc, args, &rc); free(rv); - assert(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); return post_udp_op_check(memc, expected_ids); } static test_return_t udp_version_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids = get_udp_request_ids(memc); rc = memcached_version(memc); - assert(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); return post_udp_op_check(memc, expected_ids); } static test_return_t udp_get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; size_t vlen; uint16_t *expected_ids = get_udp_request_ids(memc); char *val= memcached_get(memc, key, strlen(key), &vlen, (uint32_t)0, &rc); - assert(rc == MEMCACHED_NOT_SUPPORTED); - assert(val == NULL); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(val == NULL); return post_udp_op_check(memc, expected_ids); } @@ -4530,20 +4628,20 @@ static test_return_t udp_mixed_io_test(memcached_st *memc) for (x= 0; x < 500; x++) { current_op= mixed_io_ops[random() % 9]; - assert(current_op.function(memc) == TEST_SUCCESS); + test_truth(current_op.function(memc) == TEST_SUCCESS); } return TEST_SUCCESS; } static test_return_t hsieh_avaibility_test (memcached_st *memc) { - memcached_return expected_rc= MEMCACHED_FAILURE; + memcached_return_t expected_rc= MEMCACHED_FAILURE; #ifdef HAVE_HSIEH_HASH expected_rc= MEMCACHED_SUCCESS; #endif - memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, + memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); - assert(rc == expected_rc); + test_truth(rc == expected_rc); return TEST_SUCCESS; } @@ -4595,7 +4693,7 @@ static test_return_t md5_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MD5); - assert(values[x] == hash_val); + test_truth(values[x] == hash_val); } return TEST_SUCCESS; @@ -4789,7 +4887,7 @@ static test_return_t jenkins_run (memcached_st *memc __attribute__((unused))) static test_return_t ketama_compatibility_libmemcached(memcached_st *trash) { - memcached_return rc; + memcached_return_t rc; uint64_t value; int x; memcached_server_st *server_pool; @@ -4848,7 +4946,7 @@ static test_return_t ketama_compatibility_libmemcached(memcached_st *trash) static test_return_t ketama_compatibility_spymemcached(memcached_st *trash) { - memcached_return rc; + memcached_return_t rc; uint64_t value; int x; memcached_server_st *server_pool; @@ -4910,7 +5008,7 @@ static test_return_t regression_bug_434484(memcached_st *memc) if (pre_binary(memc) != MEMCACHED_SUCCESS) return TEST_SKIPPED; - memcached_return ret; + memcached_return_t ret; const char *key= "regression_bug_434484"; size_t keylen= strlen(key); @@ -4932,9 +5030,9 @@ static test_return_t regression_bug_434843(memcached_st *memc) if (pre_binary(memc) != MEMCACHED_SUCCESS) return TEST_SKIPPED; - memcached_return rc; + memcached_return_t rc; unsigned int counter= 0; - memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; /* * I only want to hit only _one_ server so I know the number of requests I'm @@ -4996,7 +5094,7 @@ static test_return_t regression_bug_434843(memcached_st *memc) static test_return_t regression_bug_434843_buffered(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); assert(rc == MEMCACHED_SUCCESS); @@ -5005,7 +5103,7 @@ static test_return_t regression_bug_434843_buffered(memcached_st *memc) static test_return_t regression_bug_421108(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); assert(rc == MEMCACHED_SUCCESS); @@ -5046,7 +5144,7 @@ static test_return_t regression_bug_421108(memcached_st *memc) */ static test_return_t regression_bug_442914(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); assert(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); @@ -5083,7 +5181,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) if (memc->number_of_hosts < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) return TEST_SKIPPED; - memcached_return rc; + memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2); assert(rc == MEMCACHED_SUCCESS); @@ -5124,7 +5222,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); unsigned int counter= 0; - memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); /* Verify that we received all of the key/value pairs */ assert(counter == (unsigned int)max_keys); @@ -5210,7 +5308,7 @@ static test_return_t regression_bug_463297(memcached_st *memc) assert(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); /* If we don't know the server version, we should get a protocol error */ - memcached_return rc= memcached_delete(memc, "foo", 3, 1); + memcached_return_t rc= memcached_delete(memc, "foo", 3, 1); /* but there is a bug in some of the memcached servers (1.4) that treats * the counter as noreply so it doesn't send the proper error message */ @@ -5249,7 +5347,7 @@ static test_return_t regression_bug_463297(memcached_st *memc) */ static test_return_t test_get_last_disconnect(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_server_st *disconnected_server; /* With the working set of server */ @@ -5300,7 +5398,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) */ static test_return_t wrong_failure_counter_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; /* Set value to force connection to the server */ const char *key= "marmotte"; @@ -5499,6 +5597,7 @@ test_st replication_tests[]= { {"get", 0, replication_get_test }, {"mget", 0, replication_mget_test }, {"delete", 0, replication_delete_test }, + {"rand_mget", 0, replication_randomize_mget_test }, {0, 0, 0} };