{
memcached_return_t rc;
container->parent= memcached_create(NULL);
- test_truth((container->parent != NULL));
+ test_true((container->parent != NULL));
rc= memcached_server_push(container->parent, container->construct.servers);
- test_truth(rc == MEMCACHED_SUCCESS);
+ test_true(rc == MEMCACHED_SUCCESS);
return TEST_SUCCESS;
}
test_return_t world_test_startup(libmemcached_test_container_st *container)
{
container->memc= memcached_clone(NULL, container->parent);
- test_truth((container->memc != NULL));
+ test_true((container->memc != NULL));
return TEST_SUCCESS;
}
{
for (uint32_t loop= 0; loop < memcached_server_list_count(container->construct.servers); loop++)
{
- memcached_server_st *instance=
- memcached_server_instance_fetch(container->memc, loop);
+ const memcached_server_instance_st *instance=
+ memcached_server_instance_by_position(container->memc, loop);
- test_truth(instance->fd == -1);
- test_truth(instance->cursor_active == 0);
+ test_true(instance->fd == -1);
+ test_true(instance->cursor_active == 0);
}
return TEST_SUCCESS;
test_return_t world_post_run(libmemcached_test_container_st *container)
{
- test_truth(container->memc);
+ test_true(container->memc);
return TEST_SUCCESS;
}
}
}
+static test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+{
+ if (func)
+ {
+ return func(container->parent);
+ }
+ else
+ {
+ return TEST_SUCCESS;
+ }
+}
+
+static test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
+{
+ if (func)
+ {
+ return func(container->parent);
+ }
+ else
+ {
+ return TEST_SUCCESS;
+ }
+}
+
#ifdef __cplusplus
}
#endif
#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>(_runner_default),
- reinterpret_cast<test_callback_runner_fn>(_runner_default)
+ reinterpret_cast<test_callback_runner_fn>(_post_runner_default)
};
#else
static world_runner_st defualt_libmemcached_runner= {
+ (test_callback_runner_fn)_pre_runner_default,
(test_callback_runner_fn)_runner_default,
- (test_callback_runner_fn)_runner_default,
- (test_callback_runner_fn)_runner_default
+ (test_callback_runner_fn)_post_runner_default
};
#endif