Move runner out so that it will be shared.

[m6w6/libmemcached] / tests / libmemcached_world_socket.h

diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index b1748cab4cb2249653e5cb31eaef12056e64fcab..e2ff7e1d17abc6a46a14ea11dfa25ae23eff2f41 100644 (file)
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -190,64 +190,6 @@ static bool world_destroy(void *object)
 
 typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
 
-static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
-  if (func)
-  {
-    test_true(container);
-    test_true(container->memc);
-    test_return_t ret;
-    try {
-      ret= func(container->memc);
-    }
-    catch (std::exception& e)
-    {
-      libtest::Error << e.what();
-      return TEST_FAILURE;
-    }
-
-    return ret;
-  }
-
-  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);
-  }
-
-  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);
-  }
-
-  return TEST_SUCCESS;
-}
-
-class LibmemcachedRunner : public libtest::Runner {
-public:
-  test_return_t run(test_callback_fn* func, void *object)
-  {
-    return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t pre(test_callback_fn* func, void *object)
-  {
-    return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t post(test_callback_fn* func, void *object)
-  {
-    return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-};
+#include "tests/runner.h"
 
 static LibmemcachedRunner defualt_libmemcached_runner;