Merge

[m6w6/libmemcached] / tests / test.h

diff --git a/tests/test.h b/tests/test.h
index 9f0f47e355968931ac384b520ae365e7c66f2277..28388bbd7f0add79e79863005a50c5b11b36cf48 100644 (file)
--- a/tests/test.h
+++ b/tests/test.h
@@ -14,8 +14,13 @@
 extern "C" {
 #endif
 
-#include <libmemcached/memcached.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 
 typedef struct world_st world_st;
 typedef struct collection_st collection_st;
@@ -80,23 +85,34 @@ struct world_st {
   test_callback_create_fn create;
   test_callback_fn destroy;
 
-  /* This is called a the beginning of any collection run. */
-  test_callback_fn collection_startup;
+  struct {
+    /* This is called a the beginning of any test run. */
+    test_callback_fn startup;
 
-  /* This called on a test if the test requires a flush call (the bool is from test_st) */
-  test_callback_fn flush;
+    /* This called on a test if the test requires a flush call (the bool is from test_st) */
+    test_callback_fn flush;
 
-  /**
-    These are run before/after the test. If implemented. Their execution is not controlled
-    by the test.
-  */
-  test_callback_fn pre_run;
-  test_callback_fn post_run;
+    /**
+      These are run before/after the test. If implemented. Their execution is not controlled
+      by the test.
+    */
+    test_callback_fn pre_run;
+    test_callback_fn post_run;
+
+    /**
+      If an error occurs during the test, this is called.
+    */
+    test_callback_error_fn on_error;
+  } test;
+
+  struct {
+    /* This is called a the beginning of any collection run. */
+    test_callback_fn startup;
+
+    /* This is called at the end of any collection run. */
+    test_callback_fn shutdown;
+  } collection;
 
-  /**
-    If an error occurs during the test, this is called.
-  */
-  test_callback_error_fn on_error;
 
   /**
     Runner represents the callers for the tests. If not implemented we will use
@@ -111,6 +127,10 @@ struct world_st {
   @note world_stats_st is a simple structure for tracking test successes.
 */
 typedef struct {
+  uint32_t collection_success;
+  uint32_t collection_skipped;
+  uint32_t collection_failed;
+  uint32_t collection_total;
   uint32_t success;
   uint32_t skipped;
   uint32_t failed;
@@ -127,7 +147,15 @@ void create_core(void);
 */
 const char *test_strerror(test_return_t code);
 
-#define test_truth(A) \
+#define test_fail(A) \
+do \
+{ \
+  fprintf(stderr, "\nFailed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+  create_core(); \
+  return TEST_FAILURE; \
+} while (0)
+
+#define test_true(A) \
 do \
 { \
   if (! (A)) { \