X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.h;h=77adaf539c21a06ce085bdf66cbd9b4962e34d34;hb=bc1d860b616cf9f34244377808a75c638d435a5e;hp=de9d6de2882ed6cca697e923d33788f1b963b5bc;hpb=fa543a0643aafcd5042080ca060f0418b95eb8ca;p=m6w6%2Flibmemcached

diff --git a/tests/test.h b/tests/test.h
index de9d6de2..77adaf53 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,16 +1,28 @@
 /*
   Structures for generic tests.
 */
-#include <memcached.h>
-#include "../lib/common.h"
+#ifdef	__cplusplus
+extern "C" {
 
+#endif
+#include <libmemcached/memcached.h>
+#include "../libmemcached/common.h"
+
+typedef struct world_st world_st;
 typedef struct collection_st collection_st;
 typedef struct test_st test_st;
 
+typedef enum {
+  TEST_SUCCESS= 0, /* Backwards compatibility */
+  TEST_FAILURE,
+  TEST_MEMORY_ALLOCATION_FAILURE,
+  TEST_MAXIMUM_RETURN /* Always add new error code before */
+} test_return;
+
 struct test_st {
   char *name;
   unsigned int requires_flush;
-  void (*function)(memcached_st *memc);
+  test_return (*function)(memcached_st *memc);
 };
 
 struct collection_st {
@@ -20,5 +32,15 @@ struct collection_st {
   test_st *tests;
 };
 
+struct world_st {
+  collection_st *collections;
+  void *(*create)(void);
+  void (*destroy)(void *collection_object);
+};
+
 /* How we make all of this work :) */
-collection_st *gets_collections(void);
+void get_world(world_st *world);
+
+#ifdef	__cplusplus
+}
+#endif