X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.h;h=3c3c37d1b0d10e97ca1d0821e3631b554416d25a;hb=62d142cd69b5b6b7e044319085bc011e85dd90eb;hp=117e59ceaca767965fa88bb602116d92c366d24d;hpb=5e18f5bdda1bebc6e6eef25a37d0a04a30e847af;p=awesomized%2Flibmemcached

diff --git a/libtest/test.h b/libtest/test.h
index 117e59ce..3c3c37d1 100644
--- a/libtest/test.h
+++ b/libtest/test.h
@@ -40,6 +40,8 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
 
+#include <libtest/lite.h>
+
 /**
   A structure describing the test case.
 */
@@ -61,17 +63,6 @@ do \
   } \
 } while (0)
 
-#define test_assert(A, B) \
-do \
-{ \
-  if ((A)) { \
-    fprintf(stderr, "\n%s:%d: Assertion failed %s, with message %s, in %s", __FILE__, __LINE__, (B), #A, __func__ );\
-    fprintf(stderr, "\n"); \
-    libtest::create_core(); \
-    assert((A)); \
-  } \
-} while (0)
-
 #define test_truth(A) \
 do \
 { \
@@ -92,16 +83,11 @@ do \
   } \
 } while (0)
 
-#define test_true_got(__expected, __hint) \
-do \
-{ \
-  if (not libtest::_compare_truth_hint(__FILE__, __LINE__, __func__, ((__expected)), #__expected, ((__hint)))) \
-  { \
-    libtest::create_core(); \
-    return TEST_FAILURE; \
-  } \
-} while (0)
-#define test_true_hint test_true_got
+#define test_true_got(A, B) test_true(A);
+#define test_true_hint(A, B) test_true(A);
+
+#define test_compare_hint(A, B, C) test_compare(A, B);
+#define test_compare_got(A, B, C) test_compare(A, B);
 
 #define test_skip(__expected, __actual) \
 do \
@@ -112,15 +98,6 @@ do \
   } \
 } while (0)
 
-#define test_skip_hint(__expected, __actual, __hint) \
-do \
-{ \
-  if (libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint)) == false) \
-  { \
-    return TEST_SKIPPED; \
-  } \
-} while (0)
-
 #define test_skip_valgrind() \
 do \
 { \
@@ -164,7 +141,7 @@ do \
 #define test_ne_compare(__expected, __actual) \
 do \
 { \
-  if (libtest::_ne_compare_hint(__FILE__, __LINE__, __func__, ((__expected)), ((__actual)), true) == false) \
+  if (libtest::_ne_compare(__FILE__, __LINE__, __func__, ((__expected)), ((__actual)), true) == false) \
   { \
     libtest::create_core(); \
     return TEST_FAILURE; \
@@ -184,7 +161,7 @@ do \
 #define test_zero(__actual) \
 do \
 { \
-  if (not libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual)))) \
+  if (libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual))) == false) \
   { \
     libtest::create_core(); \
     return TEST_FAILURE; \
@@ -193,43 +170,18 @@ do \
 
 #define test_null test_zero
 
-#define test_compare_got(__expected, __actual, __hint) \
-do \
-{ \
-  if (not libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint))) \
-  { \
-    libtest::create_core(); \
-    return TEST_FAILURE; \
-  } \
-} while (0)
-
-#define test_compare_hint test_compare_got
-
 #define test_compare_warn(__expected, __actual) \
 do \
 { \
   void(libtest::_compare(__FILE__, __LINE__, __func__, (__expected), (__actual)), true); \
 } while (0)
 
-#define test_compare_warn_hint(__expected, __actual, __hint) \
-do \
-{ \
-  libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint)); \
-} while (0)
-
-#define test_warn(__truth) \
-do \
-{ \
-  void(libtest::_truth(__FILE__, __LINE__, __func__, (__truth))); \
-} while (0)
-
-#define test_warn_hint(__truth, __hint) \
+#define test_warn(__truth, __explain) \
 do \
 { \
-  void(libtest::_compare_truth_hint(__FILE__, __LINE__, __func__, (__truth), #__truth, (__hint))); \
+  void(libtest::_assert_truth(__FILE__, __LINE__, __func__, bool((__truth)), #__truth, __explain)); \
 } while (0)
 
-
 #define test_strcmp(__expected, __actual) \
 do \
 { \
@@ -247,17 +199,6 @@ do \
   } \
 } while (0)
 
-#define test_memcmp_hint(A,B,C,__hint) \
-do \
-{ \
-  if ((A) == NULL or (B) == NULL or memcmp((A), (B), (C))) \
-  { \
-    fprintf(stderr, "\n%s:%d: (hint:%s) %.*s -> %.*s\n", __FILE__, __LINE__, __hint, (int)(C), (char *)(A), (int)(C), (char *)(B)); \
-    libtest::create_core(); \
-    return TEST_FAILURE; \
-  } \
-} while (0)
-
 #define test_return_if(__test_return_t) \
 do \
 { \