Commit b73296f519b18b27b5c17832b177ea9e09bfd9cb
2023-04-13T09:24:21
wip tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
diff --git a/test/test.c b/test/test.c
index 55045aa..4427bc5 100644
--- a/test/test.c
+++ b/test/test.c
@@ -21,6 +21,9 @@
#define TEST_KO_MAX 10
+long g_test_assert_count = 0;
+long g_test_assert_ko = 0;
+long g_test_assert_ok = 0;
const char *g_test_case_name = NULL;
const char *g_test_context = NULL;
long g_test_count = 0;
@@ -125,6 +128,8 @@ void test_init (int argc, char **argv)
void test_ko ()
{
+ g_test_assert_count++;
+ g_test_assert_ko++;
g_test_count++;
g_test_ko++;
fprintf(stderr, "%sF%s", TEST_COLOR_KO, TEST_COLOR_RESET);
diff --git a/test/test.h b/test/test.h
index 76f1855..6dedd56 100644
--- a/test/test.h
+++ b/test/test.h
@@ -22,12 +22,14 @@
#define TEST_ASSERT(test) \
do { \
if (test) { \
- test_ok(); \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
} \
else { \
test_ko(); \
printf("\nAssertion failed in %s:%d %s\n%s\n", \
__FILE__, __LINE__, __func__, # test); \
+ return 1; \
} \
} while(0)
@@ -37,6 +39,7 @@
g_test_case_name = # name; \
#define TEST_CASE_END(name) \
+ test_ok(); \
return 0; \
}
@@ -50,7 +53,8 @@
do { \
long long signed TEST_EQ_tmp = (long long signed) (test); \
if (TEST_EQ_tmp == (long long signed) (expected)) { \
- test_ok(); \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
} \
else { \
test_ko(); \
@@ -61,14 +65,18 @@
__FILE__, __LINE__, __func__, \
# test, # expected, # expected, TEST_EQ_tmp, \
TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
#define TEST_FLOAT_EQ(test, expected) \
do { \
float TEST_FLOAT_EQ_tmp = (float) (test); \
- if (fabsf(TEST_FLOAT_EQ_tmp - (float) (expected)) <= FLT_EPSILON) \
- test_ok(); \
+ if (fabsf(TEST_FLOAT_EQ_tmp - (float) (expected)) <= \
+ FLT_EPSILON) { \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
+ } \
else { \
test_ko(); \
printf("\n%sAssertion failed in %s:%d %s\n" \
@@ -78,6 +86,7 @@
__FILE__, __LINE__, __func__, \
# test, # expected, # expected, TEST_FLOAT_EQ_tmp, \
TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
@@ -87,8 +96,10 @@
if (fabsf(TEST_FLOAT_EQ2_tmp - \
(float) (expected1)) <= FLT_EPSILON || \
fabsf(TEST_FLOAT_EQ2_tmp - \
- (float) (expected2)) <= FLT_EPSILON) \
- test_ok(); \
+ (float) (expected2)) <= FLT_EPSILON) { \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
+ } \
else { \
test_ko(); \
printf("\n%sAssertion failed in %s:%d %s\n" \
@@ -98,14 +109,17 @@
__FILE__, __LINE__, __func__, \
# test, # expected1, # expected1, TEST_FLOAT_EQ2_tmp, \
TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
#define TEST_DOUBLE_EQ(test, expected) \
do { \
f64 TEST_DOUBLE_EQ_tmp = (double) (test); \
- if (fabs(TEST_DOUBLE_EQ_tmp - (expected)) <= DBL_EPSILON) \
- test_ok(); \
+ if (fabs(TEST_DOUBLE_EQ_tmp - (expected)) <= DBL_EPSILON) { \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
+ } \
else { \
test_ko(); \
printf("\n%sAssertion failed in %s:%d %s\n" \
@@ -115,6 +129,7 @@
__FILE__, __LINE__, __func__, \
# test, # expected, # expected, TEST_DOUBLE_EQ_tmp, \
TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
@@ -122,7 +137,8 @@
do { \
sw TEST_STR_COMPARE_tmp = str_compare(a, b); \
if (TEST_STR_COMPARE_tmp == expected) { \
- test_ok(); \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
} \
else { \
test_ko(); \
@@ -133,6 +149,7 @@
__FILE__, __LINE__, __func__, \
# a, # b, # expected, # expected, TEST_STR_COMPARE_tmp, \
TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
@@ -140,7 +157,8 @@
do { \
const char *TEST_STRNCMP_tmp = (test); \
if (strncmp(TEST_STRNCMP_tmp, (result), (bytes)) == 0) { \
- test_ok(); \
+ g_test_assert_count++; \
+ g_test_assert_ok++; \
} \
else { \
test_ko(); \
@@ -153,15 +171,19 @@
# result); \
fwrite(TEST_STRNCMP_tmp, (bytes), 1, stdout); \
printf("\".%s\n", TEST_COLOR_RESET); \
+ return 1; \
} \
} while (0)
+extern long g_test_assert_count;
+extern long g_test_assert_ko;
+extern long g_test_assert_ok;
+extern const char *g_test_case_name;
extern long g_test_count;
extern long g_test_ko;
extern long g_test_last_ok;
extern long g_test_ok;
extern const char **g_test_targets;
-extern const char *g_test_case_name;
void test_clean ();
void test_context (const char *context);