X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.h;h=7c0e49daef93e2ce0b05027f04df4d97767b7b21;hb=bcefa7bfce1047ac2b2fe1a7243bac6f9999ffa5;hp=88e62800438beb5a7f094bd0889dd91274694d89;hpb=898a8a7a246d9f7fa712654eb855371b9a159b7c;p=m6w6%2Flibmemcached

diff --git a/tests/test.h b/tests/test.h
index 88e62800..7c0e49da 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,13 +1,28 @@
 /*
   Structures for generic tests.
 */
+#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 {
@@ -17,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