Refactor test framework to run pre/post just once.

[m6w6/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 6916a32c2396aa4e42d44b6be1b0fe00d1738d8e..45927a23afac06d7afcf66e1c24d3a9f044d7aae 100644 (file)
--- 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,15 +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->construct.servers); loop++)
   {
     memcached_server_st *instance=
       memcached_server_instance_fetch(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;
@@ -113,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;
 }
@@ -151,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
@@ -158,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