X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=fc0b6ae8a8dad12ec3d830a16f8e942d16d04735;hb=9b8fc810c535e80d8b68196487d751c382b0bb27;hp=c26323119b35696044d2e13f94ffc0d0dc23a521;hpb=a246ac50a88e4af750fd2dd209eff94dcadf72d2;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index c2632311..fc0b6ae8 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -4,7 +4,7 @@
  *
  * Use and distribution licensed under the BSD license.  See
  * the COPYING file in the parent directory for full text.
- * 
+ *
  * Description: This is the startup bits for any libmemcached test.
  *
  */
@@ -14,15 +14,23 @@ 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(void);
-test_return_t world_collection_startup(libmemcached_test_container_st *);
+libmemcached_test_container_st *world_create(test_return_t *error);
+test_return_t world_test_startup(libmemcached_test_container_st *);
 test_return_t world_flush(libmemcached_test_container_st *container);
 test_return_t world_pre_run(libmemcached_test_container_st *);
 
@@ -32,27 +40,53 @@ test_return_t world_destroy(libmemcached_test_container_st *);
 
 static libmemcached_test_container_st global_container;
 
-libmemcached_test_container_st *world_create(void)
+/**
+  @note generic shutdown/startup for libmemcached tests.
+*/
+test_return_t world_container_startup(libmemcached_test_container_st *container);
+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);
 
-  assert(global_container.construct.servers);
+  if (not global_container.construct.servers)
+  {
+    *error= TEST_FAILURE;
+    server_shutdown(&global_container.construct);
+    return NULL;
+  }
+
+  *error= TEST_SUCCESS;
 
   return &global_container;
 }
 
+test_return_t world_container_startup(libmemcached_test_container_st *container)
+{
+  container->parent= memcached_create(NULL);
+  test_true((container->parent != NULL));
+
+  test_compare(MEMCACHED_SUCCESS,
+	       memcached_server_push(container->parent, container->construct.servers));
 
-test_return_t world_collection_startup(libmemcached_test_container_st *container)
+  return TEST_SUCCESS;
+}
+
+test_return_t world_container_shutdown(libmemcached_test_container_st *container)
 {
-  memcached_return_t rc;
-  container->memc= memcached_create(NULL);
-  test_truth((container->memc != NULL));
+  memcached_free(container->parent);
+  container->parent= NULL;
 
-  rc= memcached_server_push(container->memc, container->construct.servers);
-  test_truth(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_true((container->memc != NULL));
 
   return TEST_SUCCESS;
 }
@@ -67,12 +101,13 @@ test_return_t world_flush(libmemcached_test_container_st *container)
 
 test_return_t world_pre_run(libmemcached_test_container_st *container)
 {
-  uint32_t loop;
-
-  for (loop= 0; loop < memcached_server_list_count(container->construct.servers); loop++)
+  for (uint32_t loop= 0; loop < memcached_server_list_count(container->memc->servers); loop++)
   {
-    test_truth(container->memc->hosts[loop].fd == -1);
-    test_truth(container->memc->hosts[loop].cursor_active == 0);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(container->memc, loop);
+
+    test_compare(-1, instance->fd);
+    test_compare(0, instance->cursor_active);
   }
 
   return TEST_SUCCESS;
@@ -81,7 +116,7 @@ test_return_t world_pre_run(libmemcached_test_container_st *container)
 
 test_return_t world_post_run(libmemcached_test_container_st *container)
 {
-  assert(container->memc);
+  test_true(container->memc);
 
   return TEST_SUCCESS;
 }
@@ -90,7 +125,8 @@ test_return_t world_on_error(test_return_t test_state, libmemcached_test_contain
 {
   (void)test_state;
   memcached_free(container->memc);
-  
+  container->memc= NULL;
+
   return TEST_SUCCESS;
 }
 
@@ -102,6 +138,10 @@ test_return_t world_destroy(libmemcached_test_container_st *container)
 
   server_shutdown(construct);
 
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  sasl_done();
+#endif
+
   return TEST_SUCCESS;
 }
 
@@ -118,24 +158,48 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
   }
 }
 
+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>(_runner_default),
-  reinterpret_cast<test_callback_runner_fn>(_runner_default),
-  reinterpret_cast<test_callback_runner_fn>(_runner_default)
+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= {
-  (test_callback_runner_fn)_runner_default,
+static Runner 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)_post_runner_default
 };
 
 #endif