X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.h;h=d74038c2905fddfb4f940a852a46db740d2791c8;hb=7c986323bd4eece0d805f4df17eb03ea094f84f6;hp=b002cd1e05a4d896d7cd9b27e9ce3981214793da;hpb=b4de8d3fd063b9017797dd9809ab3acb8a537606;p=m6w6%2Flibmemcached

diff --git a/tests/test.h b/tests/test.h
index b002cd1e..d74038c2 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,6 +1,15 @@
+/* uTest
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ */
+
 /*
   Structures for generic tests.
 */
+
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -20,25 +29,94 @@ typedef enum {
   TEST_MAXIMUM_RETURN /* Always add new error code before */
 } test_return_t;
 
+typedef void *(*test_callback_create_fn)(void);
+typedef test_return_t (*test_callback_fn)(void *);
+typedef test_return_t (*test_callback_runner_fn)(test_callback_fn, void *);
+typedef test_return_t (*test_callback_error_fn)(test_return_t, void *);
+
+
+/**
+  A structure describing the test case.
+*/
 struct test_st {
   const char *name;
-  unsigned int requires_flush;
-  test_return_t (*function)(memcached_st *memc);
+  bool requires_flush;
+  test_callback_fn test_fn;
 };
 
+
+/**
+  A structure which describes a collection of test cases.
+*/
 struct collection_st {
   const char *name;
-  memcached_return_t (*pre)(memcached_st *memc);
-  memcached_return_t (*post)(memcached_st *memc);
+  test_callback_fn pre;
+  test_callback_fn post;
   test_st *tests;
 };
 
+
+/**
+  Structure which houses the actual callers for the test cases contained in 
+  the collections.
+*/
+typedef struct {
+  test_callback_runner_fn pre;
+  test_callback_runner_fn run;
+  test_callback_runner_fn post;
+} world_runner_st;
+
+
+/**
+  world_st is the structure which is passed to the test implementation to be filled.
+  This must be implemented in order for the test framework to load the tests. We call
+  get_world() in order to fill this structure.
+*/
+
 struct world_st {
   collection_st *collections;
-  void *(*create)(void);
-  void (*destroy)(void *collection_object);
+  
+  /* These methods are called outside of any collection call. */
+  test_callback_create_fn create;
+  test_callback_fn destroy;
+
+  /* This is called a the beginning of any collection run. */
+  test_callback_fn collection_startup;
+
+  /* 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;
+  
+  /** 
+    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
+    a set of default implementations. 
+  */
+  world_runner_st *runner;
 };
 
+
+
+/**
+  @note world_stats_st is a simple structure for tracking test successes.
+*/
+typedef struct {
+  uint32_t success;
+  uint32_t skipped;
+  uint32_t failed;
+  uint32_t total;
+} world_stats_st;
+
 /* How we make all of this work :) */
 void get_world(world_st *world);
 
@@ -48,7 +126,7 @@ void create_core(void);
 do \
 { \
   if (! (A)) { \
-    fprintf(stderr, "Assertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+    fprintf(stderr, "\nAssertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
     create_core(); \
     return TEST_FAILURE; \
   } \
@@ -58,7 +136,7 @@ do \
 do \
 { \
   if ((A)) { \
-    fprintf(stderr, "Assertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+    fprintf(stderr, "\nAssertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
     create_core(); \
     return TEST_FAILURE; \
   } \
@@ -69,7 +147,7 @@ do \
 { \
   if (strcmp((A), (B))) \
   { \
-    fprintf(stderr, "%d", __LINE__); \
+    fprintf(stderr, "\n%s:%d: %s -> %s\n", __FILE__, __LINE__, (A), (B)); \
     create_core(); \
     return TEST_FAILURE; \
   } \