X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fplus.cpp;h=c0c6bb9503713eb3271b4c86ae24dfd567be8285;hb=dc421179c0d159f1ca8a6b2b64b89163a7e0c639;hp=be6cde5098cfad6d1cd2e39a4799cfd7c3dbaf37;hpb=a246ac50a88e4af750fd2dd209eff94dcadf72d2;p=m6w6%2Flibmemcached

diff --git a/tests/plus.cpp b/tests/plus.cpp
index be6cde50..c0c6bb95 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -12,9 +12,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
-#include "server.h"
 
-#include "test.h"
+#include <libtest/server.h>
+
+#include <libtest/test.h>
 
 #include <string>
 #include <iostream>
@@ -29,7 +30,7 @@ extern "C" {
    test_return_t mget_result_function(memcached_st *memc);
    test_return_t basic_behavior(memcached_st *memc);
    test_return_t mget_test(memcached_st *memc);
-   memcached_return_t callback_counter(memcached_st *,
+   memcached_return_t callback_counter(const memcached_st *,
                                        memcached_result_st *,
                                        void *context);
 }
@@ -150,9 +151,9 @@ test_return_t basic_master_key_test(memcached_st *memc)
 }
 
 /* Count the results */
-memcached_return_t callback_counter(memcached_st *,
-                                  memcached_result_st *,
-                                  void *context)
+memcached_return_t callback_counter(const memcached_st *,
+                                    memcached_result_st *,
+                                    void *context)
 {
   unsigned int *counter= static_cast<unsigned int *>(context);
 
@@ -299,12 +300,18 @@ collection_st collection[] ={
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->collection_startup= reinterpret_cast<test_callback_fn>(world_collection_startup);
-  world->flush= reinterpret_cast<test_callback_fn>(world_flush);
-  world->pre_run= reinterpret_cast<test_callback_fn>(world_pre_run);
+
   world->create= reinterpret_cast<test_callback_create_fn>(world_create);
-  world->post_run= reinterpret_cast<test_callback_fn>(world_post_run);
-  world->on_error= reinterpret_cast<test_callback_error_fn>(world_on_error);
   world->destroy= reinterpret_cast<test_callback_fn>(world_destroy);
+
+  world->test.startup= reinterpret_cast<test_callback_fn>(world_test_startup);
+  world->test.flush= reinterpret_cast<test_callback_fn>(world_flush);
+  world->test.pre_run= reinterpret_cast<test_callback_fn>(world_pre_run);
+  world->test.post_run= reinterpret_cast<test_callback_fn>(world_post_run);
+  world->test.on_error= reinterpret_cast<test_callback_error_fn>(world_on_error);
+
+  world->collection.startup= reinterpret_cast<test_callback_fn>(world_container_startup);
+  world->collection.shutdown= reinterpret_cast<test_callback_fn>(world_container_shutdown);
+
   world->runner= &defualt_libmemcached_runner;
 }