Catch up with Gearman's libtest

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

diff --git a/tests/libmemcached-1.0/all_tests_socket.cc b/tests/libmemcached-1.0/all_tests_socket.cc
index 6398c1eba41e4852f4677626412090f99638cd3e..958873fb9f3fd7cd4e78e9de6bd6d019904376f4 100644 (file)
--- a/tests/libmemcached-1.0/all_tests_socket.cc
+++ b/tests/libmemcached-1.0/all_tests_socket.cc
@@ -45,7 +45,7 @@
 #include "tests/exist.h"
 #include "tests/ketama.h"
 #include "tests/namespace.h"
-#include "tests/parser.h"
+#include "tests/libmemcached-1.0/parser.h"
 #include "tests/libmemcached-1.0/dump.h"
 #include "tests/libmemcached-1.0/generate.h"
 #include "tests/libmemcached-1.0/haldenbrand.h"
@@ -71,19 +71,10 @@
 
 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->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->create((test_callback_create_fn*)world_create);
+  world->destroy((test_callback_destroy_fn*)world_destroy);
 
   world->set_runner(new LibmemcachedRunner);
 }