diff options
| author | Brian Aker <brian@gir-3.local> | 2011-06-21 00:38:30 -0700 |
|---|---|---|
| committer | Brian Aker <brian@gir-3.local> | 2011-06-21 00:38:30 -0700 |
| commit | 9fd31c03436acf24c593dc3a77c905eb137ef570 (patch) | |
| tree | c220df4f802e4a1ba1e5e2961efd50c831d0ff82 /tests/libmemcached_world.h | |
| parent | 1012478a8a748a8be019d212b3cb2aab3c45f190 (diff) | |
| download | libmemcached-9fd31c03436acf24c593dc3a77c905eb137ef570.tar.gz | |
Merge in code such that we are much closer to running the same test
framework in all projects.
Diffstat (limited to 'tests/libmemcached_world.h')
| -rw-r--r-- | tests/libmemcached_world.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h index 4793569c..36136c6e 100644 --- a/tests/libmemcached_world.h +++ b/tests/libmemcached_world.h @@ -14,12 +14,19 @@ extern "C" { #endif /* The structure we use for the test system */ -typedef struct +struct libmemcached_test_container_st { server_startup_st construct; memcached_st *parent; memcached_st *memc; -} libmemcached_test_container_st; + + libmemcached_test_container_st() : + parent(NULL), + memc(NULL) + { + memset(&construct, 0, sizeof(server_startup_st)); + } +}; /* Prototypes for functions we will pass to test framework */ libmemcached_test_container_st *world_create(test_return_t *error); @@ -41,12 +48,11 @@ test_return_t world_container_shutdown(libmemcached_test_container_st *container libmemcached_test_container_st *world_create(test_return_t *error) { - memset(&global_container, 0, sizeof(global_container)); global_container.construct.count= SERVERS_TO_CREATE; global_container.construct.udp= 0; server_startup(&global_container.construct); - if (! global_container.construct.servers) + if (not global_container.construct.servers) { *error= TEST_FAILURE; server_shutdown(&global_container.construct); @@ -60,12 +66,11 @@ libmemcached_test_container_st *world_create(test_return_t *error) test_return_t world_container_startup(libmemcached_test_container_st *container) { - memcached_return_t rc; container->parent= memcached_create(NULL); test_true((container->parent != NULL)); - rc= memcached_server_push(container->parent, container->construct.servers); - test_true(rc == MEMCACHED_SUCCESS); + test_compare(MEMCACHED_SUCCESS, + memcached_server_push(container->parent, container->construct.servers)); return TEST_SUCCESS; } @@ -101,8 +106,8 @@ test_return_t world_pre_run(libmemcached_test_container_st *container) memcached_server_instance_st instance= memcached_server_instance_by_position(container->memc, loop); - test_true(instance->fd == -1); - test_true(instance->cursor_active == 0); + test_compare(-1, instance->fd); + test_compare(0, instance->cursor_active); } return TEST_SUCCESS; @@ -184,9 +189,9 @@ static test_return_t _post_runner_default(libmemcached_test_callback_fn func, li #ifdef __cplusplus static world_runner_st defualt_libmemcached_runner= { - reinterpret_cast<test_callback_runner_fn>(_pre_runner_default), - reinterpret_cast<test_callback_runner_fn>(_runner_default), - reinterpret_cast<test_callback_runner_fn>(_post_runner_default) + reinterpret_cast<test_callback_runner_fn*>(_pre_runner_default), + reinterpret_cast<test_callback_runner_fn*>(_runner_default), + reinterpret_cast<test_callback_runner_fn*>(_post_runner_default) }; #else |