X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_udp.cc;h=535841461a9ad149edbf20f69618227616686c99;hb=c3472bb8e7417a272f8c76c5a1316e3370adc941;hp=1591bdcf1c23f9263e76177bcb4f4d45f9312868;hpb=324548f9250e1c0ad5814f1436e401ad989c84f3;p=awesomized%2Flibmemcached diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc index 1591bdcf..53584146 100644 --- a/tests/mem_udp.cc +++ b/tests/mem_udp.cc @@ -40,7 +40,7 @@ Sample test application. */ -#include +#include #include using namespace libtest; @@ -51,7 +51,6 @@ using namespace libtest; #include #include -#include #include #include #include @@ -64,6 +63,8 @@ using namespace libtest; #include +#include "libmemcached/instance.hpp" + #ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif @@ -105,9 +106,9 @@ static void get_udp_request_ids(memcached_st *memc, Expected &ids) { for (uint32_t x= 0; x < memcached_server_count(memc); x++) { - memcached_server_instance_st instance= memcached_server_instance_by_position(memc, x); + const memcached_instance_st * instance= memcached_server_instance_by_position(memc, x); - ids.push_back(get_udp_datagram_request_id((struct udp_datagram_header_st *) ((memcached_server_instance_st )instance)->write_buffer)); + ids.push_back(get_udp_datagram_request_id((struct udp_datagram_header_st *) ((const memcached_instance_st * )instance)->write_buffer)); } } @@ -144,7 +145,7 @@ static test_return_t init_udp(memcached_st *memc) static test_return_t init_udp_valgrind(memcached_st *memc) { - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SKIPPED; } @@ -156,7 +157,7 @@ static test_return_t init_udp_valgrind(memcached_st *memc) static test_return_t binary_init_udp(memcached_st *memc) { - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SKIPPED; } @@ -172,7 +173,7 @@ static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) (void)memc; #if 0 memcached_server_st server; - memcached_server_instance_st instance= + const memcached_instance_st * instance= memcached_server_instance_by_position(memc, 0); memcached_server_clone(&server, &memc->hosts[0]); test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); @@ -187,7 +188,7 @@ static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) (void)memc; #if 0 memcached_server_st server; - memcached_server_instance_st instance= + const memcached_instance_st * instance= memcached_server_instance_by_position(memc, 0); memcached_server_clone(&server, &memc->hosts[0]); test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); @@ -268,7 +269,7 @@ static test_return_t set_udp_behavior_test(memcached_st *memc) static test_return_t udp_set_test(memcached_st *memc) { // Assume we are running under valgrind, and bail - if (getenv("TESTS_ENVIRONMENT")) + if (getenv("LOG_COMPILER")) { return TEST_SUCCESS; } @@ -283,7 +284,7 @@ static test_return_t udp_set_test(memcached_st *memc) get_udp_request_ids(memc, expected_ids); unsigned int server_key= memcached_generate_hash(memc, test_literal_param("foo")); test_true(server_key < memcached_server_count(memc)); - memcached_server_instance_st instance= memcached_server_instance_by_position(memc, server_key); + const memcached_instance_st * instance= memcached_server_instance_by_position(memc, server_key); size_t init_offset= instance->write_buffer_offset; test_compare_hint(MEMCACHED_SUCCESS, @@ -348,7 +349,7 @@ static test_return_t udp_delete_test(memcached_st *memc) get_udp_request_ids(memc, expected_ids); unsigned int server_key= memcached_generate_hash(memc, test_literal_param("foo")); - memcached_server_instance_st instance= memcached_server_instance_by_position(memc, server_key); + const memcached_instance_st * instance= memcached_server_instance_by_position(memc, server_key); size_t init_offset= instance->write_buffer_offset; test_compare(MEMCACHED_SUCCESS, @@ -434,7 +435,7 @@ static test_return_t udp_decr_test(memcached_st *memc) memcached_set(memc, test_literal_param(__func__), test_literal_param("1"), - (time_t)0, (uint32_t)0)); + time_t(0), uint32_t(0))); Expected expected_ids; get_udp_request_ids(memc, expected_ids); @@ -482,7 +483,7 @@ static test_return_t udp_get_test(memcached_st *memc) size_t vlen; Expected expected_ids; get_udp_request_ids(memc, expected_ids); - test_null(memcached_get(memc, test_literal_param("foo"), &vlen, (uint32_t)0, &rc)); + test_null(memcached_get(memc, test_literal_param("foo"), &vlen, NULL, &rc)); test_compare(MEMCACHED_NOT_SUPPORTED, rc); return post_udp_op_check(memc, expected_ids); @@ -563,24 +564,14 @@ collection_st collection[] ={ {0, 0, 0, 0} }; -#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10 #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { - world->collections= collection; - - world->_create= (test_callback_create_fn*)world_create; - world->_destroy= (test_callback_destroy_fn*)world_destroy; - - world->item._startup= (test_callback_fn*)world_test_startup; - world->item._flush= (test_callback_fn*)world_flush; - world->item.set_pre((test_callback_fn*)world_pre_run); - world->item.set_post((test_callback_fn*)world_post_run); - world->_on_error= (test_callback_error_fn*)world_on_error; + world->collections(collection); - world->collection_startup= (test_callback_fn*)world_container_startup; - world->collection_shutdown= (test_callback_fn*)world_container_shutdown; + world->create((test_callback_create_fn*)world_create); + world->destroy((test_callback_destroy_fn*)world_destroy); - world->set_runner(&defualt_libmemcached_runner); + world->set_runner(new LibmemcachedRunner); }