X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests_socket.cc;h=47ab67eb407085935c437baeb5ef72f36c5b80dd;hb=cf663b377e1ef2ae8e4b7166e72562c37f59c410;hp=9698cc75a347762cea8d85f202e0c2d86f2e1ecf;hpb=a101fe771182e664d67a1609a6d9dee3d161dc81;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests_socket.cc b/tests/libmemcached-1.0/all_tests_socket.cc
index 9698cc75..47ab67eb 100644
--- a/tests/libmemcached-1.0/all_tests_socket.cc
+++ b/tests/libmemcached-1.0/all_tests_socket.cc
@@ -35,8 +35,6 @@
  *
  */
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-
 #include <config.h>
 #include <libtest/test.hpp>
 
@@ -47,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"
@@ -64,27 +62,19 @@
 
 
 #include "tests/libmemcached-1.0/mem_functions.h"
+#include "tests/libmemcached-1.0/encoding_key.h"
 
 /* Collections we are running */
 #include "tests/libmemcached-1.0/all_tests.h"
 
 #include "tests/libmemcached_world_socket.h"
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  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->collections(collection);
 
-  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(&defualt_libmemcached_runner);
+  world->set_runner(new LibmemcachedRunner);
 }