} \
} 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 \
} \
} 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 \
{ \
#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; \
#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; \
#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 \
{ \
} \
} 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 \
{ \