*
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
+#pragma once
+
+#include <cassert>
/* The structure we use for the test system */
struct libmemcached_test_container_st
libmemcached_test_container_st() :
parent(NULL),
memc(NULL)
- {
- memset(&construct, 0, sizeof(server_startup_st));
- }
+ { }
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Prototypes for functions we will pass to test framework */
libmemcached_test_container_st *world_create(test_return_t *error);
test_return_t world_test_startup(libmemcached_test_container_st *);
test_return_t world_on_error(test_return_t, libmemcached_test_container_st *);
test_return_t world_destroy(libmemcached_test_container_st *);
-static libmemcached_test_container_st global_container;
-
/**
@note generic shutdown/startup for libmemcached tests.
*/
libmemcached_test_container_st *world_create(test_return_t *error)
{
- global_container.construct.count= SERVERS_TO_CREATE;
- global_container.construct.udp= 0;
- server_startup(&global_container.construct);
-
- if (not global_container.construct.servers)
+ libmemcached_test_container_st *global_container= new libmemcached_test_container_st();
+ if (not server_startup(&global_container->construct))
{
*error= TEST_FAILURE;
- server_shutdown(&global_container.construct);
return NULL;
}
*error= TEST_SUCCESS;
- return &global_container;
+ return global_container;
}
test_return_t world_container_startup(libmemcached_test_container_st *container)
{
- container->parent= memcached_create(NULL);
- test_true((container->parent != NULL));
+ char buffer[BUFSIZ];
- test_compare(MEMCACHED_SUCCESS,
- memcached_server_push(container->parent, container->construct.servers));
+ test_compare_got(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(container->construct.server_list.c_str(), container->construct.server_list.size(),
+ buffer, sizeof(buffer)),
+ buffer);
+
+ assert(not container->parent);
+ container->parent= memcached(container->construct.server_list.c_str(), container->construct.server_list.size());
+ test_true(container->parent);
return TEST_SUCCESS;
}
test_return_t world_test_startup(libmemcached_test_container_st *container)
{
+ assert(container);
+ assert(not container->memc);
+ assert(container->parent);
container->memc= memcached_clone(NULL, container->parent);
- test_true((container->memc != NULL));
+ test_true(container->memc);
return TEST_SUCCESS;
}
test_return_t world_flush(libmemcached_test_container_st *container)
{
+ assert(container->memc);
memcached_flush(container->memc, 0);
memcached_quit(container->memc);
test_return_t world_pre_run(libmemcached_test_container_st *container)
{
+ assert(container->memc);
for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
{
memcached_server_instance_st instance=
test_return_t world_on_error(test_return_t test_state, libmemcached_test_container_st *container)
{
(void)test_state;
+ assert(container->memc);
memcached_free(container->memc);
container->memc= NULL;
test_return_t world_destroy(libmemcached_test_container_st *container)
{
server_startup_st *construct= &container->construct;
- memcached_server_st *servers= container->construct.servers;
- memcached_server_list_free(servers);
server_shutdown(construct);
sasl_done();
#endif
+ delete container;
+
return TEST_SUCCESS;
}
{
if (func)
{
+ assert(container);
+ assert(container->memc);
return func(container->memc);
}
else
#ifdef __cplusplus
-static world_runner_st defualt_libmemcached_runner= {
+static Runner 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)
#else
-static world_runner_st defualt_libmemcached_runner= {
+static Runner defualt_libmemcached_runner= {
(test_callback_runner_fn)_pre_runner_default,
(test_callback_runner_fn)_runner_default,
(test_callback_runner_fn)_post_runner_default