Merge in fixes for SASL.

[awesomized/libmemcached] / tests / cycle.cc

diff --git a/tests/cycle.cc b/tests/cycle.cc
index 493126bff2548b519fc173a93f57b3e8b012eff9..5693b04db2a294f344c81e9b25ed691f4e74e845 100644 (file)
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -39,7 +39,8 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
 
 #include <libmemcached/common.h>
 #include <libmemcached/is.h>
@@ -50,7 +51,7 @@
 
 #include <libtest/server.h>
 
-#define SERVERS_TO_CREATE 5
+using namespace libtest;
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
@@ -125,28 +126,8 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-#if 0
-static server_startup_st *world_create(test_return_t *error)
-{
-  server_startup_st *servers= new server_startup_st();
-
-  server_startup(servers);
-
-  *error= TEST_SUCCESS;
-
-  return servers;
-}
-
-static test_return_t world_destroy(server_startup_st *servers)
-{
-  server_shutdown(servers);
-  delete servers;
-
-  return TEST_SUCCESS;
-}
-#endif
-
 
+#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
 #include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
@@ -154,16 +135,18 @@ void get_world(Framework *world)
   world->collections= collection;
 
   world->_create= (test_callback_create_fn*)world_create;
-  world->_destroy= (test_callback_fn*)world_destroy;
+  world->_destroy= (test_callback_destroy_fn*)world_destroy;
 
-  world->item._startup= (test_callback_fn*)world_test_startup;
+  world->item.set_startup((test_callback_fn*)world_test_startup);
   world->item.set_pre((test_callback_fn*)world_pre_run);
   world->item.set_post((test_callback_fn*)world_post_run);
-  world->_on_error= (test_callback_error_fn*)world_on_error;
+
+  world->set_on_error((test_callback_error_fn*)world_on_error);
 
   world->collection_startup= (test_callback_fn*)world_container_startup;
   world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
 
-  world->runner= &defualt_libmemcached_runner;
+  world->set_runner(&defualt_libmemcached_runner);
+  world->set_socket();
 }