X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=5a5e15b5c4fb5ff622e08e96d08357025be29fab;hb=c4dbc7e56b01545e25bc95ba122c79d4a2631a99;hp=4092d95104773c9930c151e4d4b4c34cb31db952;hpb=d38a24defa282f8c05835c16ad1633ffb528d82c;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 4092d951..5a5e15b5 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -62,10 +62,10 @@ test_return_t world_container_startup(libmemcached_test_container_st *container)
 {
   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;
 }
@@ -81,7 +81,7 @@ test_return_t world_container_shutdown(libmemcached_test_container_st *container
 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;
 }
@@ -96,12 +96,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_true(instance->fd == -1);
+    test_true(instance->cursor_active == 0);
   }
 
   return TEST_SUCCESS;
@@ -110,7 +111,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;
 }
@@ -148,6 +149,30 @@ 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
@@ -155,17 +180,17 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
 #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