Merge in all of libtest updates.

[m6w6/libmemcached] / tests / atomsmasher.cc

diff --git a/tests/atomsmasher.cc b/tests/atomsmasher.cc
index af692c6b43a67ffa387f7f298db25b0d825616db..3f4eb405ab288247a6e41553bdd7e54703fb447b 100644 (file)
--- a/tests/atomsmasher.cc
+++ b/tests/atomsmasher.cc
@@ -12,25 +12,29 @@
 /*
   Sample test application.
 */
-#include <libtest/common.h>
+#include <config.h>
+
+#include <libtest/test.hpp>
 
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <stdint.h>
-#include <string.h>
+#include <cstring>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <time.h>
+#include <ctime>
 #include <clients/generator.h>
 #include <clients/execute.h>
 
 #include <libtest/server.h>
 
+using namespace libtest;
+
 /* Number of items generated for tests */
 #define GLOBAL_COUNT 100000
 
@@ -280,7 +284,7 @@ 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._flush= (test_callback_fn*)world_flush;
@@ -291,5 +295,5 @@ void get_world(Framework *world)
   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);
 }