Refactored tests.

[awesomized/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index 37b6260e7fe78460f8067f49db334b6033bd81a0..cb0b0837893531a72e90a9478cacd822ab3020ab 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -2,7 +2,6 @@
   C++ interface test
 */
 #include <assert.h>
-#include <memcached.h>
 #include <memcached.hh>
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,6 +11,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
+#include "server.h"
 
 #include "test.h"
 
@@ -40,7 +40,36 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-collection_st *gets_collections(void)
+#define SERVERS_TO_CREATE 1
+
+void *world_create(void)
+{
+  unsigned int x;
+  memcached_server_st *servers;
+  server_startup_st *construct;
+
+  construct= (server_startup_st *)malloc(sizeof(server_startup_st));
+  memset(construct, 0, sizeof(server_startup_st));
+
+  construct->count= SERVERS_TO_CREATE;
+  server_startup(construct);
+
+  return construct;
+}
+
+void world_destroy(void *p)
+{
+  server_startup_st *construct= (server_startup_st *)p;
+  memcached_server_st *servers= (memcached_server_st *)construct->servers;
+  memcached_server_list_free(servers);
+
+  server_shutdown(construct);
+  free(construct);
+}
+
+void get_world(world_st *world)
 {
-  return collection;
+  world->collections= collection;
+  world->create= world_create;
+  world->destroy= world_destroy;
 }