Refactor out item specific bits of the testing framework.

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

diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc
index fd3dc46e82f1866cf1eb952e2fe9ab272e97944f..2b7e9c12a4ab28bccd30e83b231c3e5075ee395a 100644 (file)
--- a/tests/libmemcached-1.0/atomsmasher.cc
+++ b/tests/libmemcached-1.0/atomsmasher.cc
@@ -41,7 +41,6 @@ using namespace libtest;
 
 /* Number of times to run the test loop */
 #define TEST_COUNTER 500000
-static uint32_t global_count;
 
 static pairs_st *global_pairs;
 static char *global_keys[GLOBAL_COUNT];
@@ -57,9 +56,8 @@ static test_return_t cleanup_pairs(memcached_st *)
 static test_return_t generate_pairs(memcached_st *)
 {
   global_pairs= pairs_generate(GLOBAL_COUNT, 400);
-  global_count= GLOBAL_COUNT;
 
-  for (ptrdiff_t x= 0; x < global_count; x++)
+  for (ptrdiff_t x= 0; x < GLOBAL_COUNT; x++)
   {
     global_keys[x]= global_pairs[x].key;
     global_keys_length[x]=  global_pairs[x].key_length;
@@ -277,8 +275,6 @@ collection_st collection[] ={
 };
 
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
 #include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
@@ -290,12 +286,10 @@ void get_world(Framework *world)
 
   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;
 
-  world->set_runner(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 }