Merge in pid/ping status.

[awesomized/libmemcached] / tests / atomsmasher.cc

diff --git a/tests/atomsmasher.cc b/tests/atomsmasher.cc
index ffde3877e7e8ccb0c3d4cd61f3d3444f7f6163d7..af692c6b43a67ffa387f7f298db25b0d825616db 100644 (file)
--- a/tests/atomsmasher.cc
+++ b/tests/atomsmasher.cc
@@ -12,7 +12,7 @@
 /*
   Sample test application.
 */
-#include "config.h"
+#include <libtest/common.h>
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
@@ -30,7 +30,6 @@
 #include <clients/execute.h>
 
 #include <libtest/server.h>
-#include <libtest/test.h>
 
 /* Number of items generated for tests */
 #define GLOBAL_COUNT 100000
@@ -276,18 +275,18 @@ collection_st collection[] ={
 
 #include "libmemcached_world.h"
 
-void get_world(world_st *world)
+void get_world(Framework *world)
 {
   world->collections= collection;
 
-  world->create= (test_callback_create_fn*)world_create;
-  world->destroy= (test_callback_fn*)world_destroy;
+  world->_create= (test_callback_create_fn*)world_create;
+  world->_destroy= (test_callback_fn*)world_destroy;
 
-  world->run_startup= (test_callback_fn*)world_test_startup;
-  world->flush= (test_callback_fn*)world_flush;
-  world->pre_run= (test_callback_fn*)world_pre_run;
-  world->post_run= (test_callback_fn*)world_post_run;
-  world->on_error= (test_callback_error_fn*)world_on_error;
+  world->item._startup= (test_callback_fn*)world_test_startup;
+  world->item._flush= (test_callback_fn*)world_flush;
+  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->collection_startup= (test_callback_fn*)world_container_startup;
   world->collection_shutdown= (test_callback_fn*)world_container_shutdown;