Catch up with Gearman's libtest

[m6w6/libmemcached] / tests / libmemcached-1.0 / sasl.cc

diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc
index 70b42987245464aa863957c68dc749f5a3524ae8..0ae101f2925f4855b574dad9c04386a5e1c18895 100644 (file)
--- a/tests/libmemcached-1.0/sasl.cc
+++ b/tests/libmemcached-1.0/sasl.cc
@@ -43,7 +43,6 @@ using namespace libtest;
   Test cases
 */
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +20
 #include <libmemcached/memcached.h>
 
 static test_return_t pre_sasl(memcached_st *)
@@ -102,21 +101,12 @@ collection_st collection[] ={
 
 void get_world(Framework *world)
 {
-  world->collections= collection;
+  world->collections(collection);
 
-  world->_create= (test_callback_create_fn*)world_create;
-  world->_destroy= (test_callback_destroy_fn*)world_destroy;
+  world->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
-  world->item._startup= (test_callback_fn*)world_test_startup;
-  world->item.set_pre((test_callback_fn*)world_pre_run);
-  world->item.set_flush((test_callback_fn*)world_flush);
-  world->item.set_post((test_callback_fn*)world_post_run);
-  world->_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->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 
   world->set_sasl("memcached", "memcached");
 }