diff options
Diffstat (limited to 'src/test/lily-test.h')
| -rw-r--r-- | src/test/lily-test.h | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/test/lily-test.h b/src/test/lily-test.h index 8b1d9ad..7b1f72b 100644 --- a/src/test/lily-test.h +++ b/src/test/lily-test.h @@ -48,7 +48,7 @@ #define LILY_VERSION_MAJOR 2 #define LILY_VERSION_MINOR 0 -#define LILY_VERSION_PATCH 0 +#define LILY_VERSION_PATCH 1 #include <stdbool.h> #include <stddef.h> @@ -57,6 +57,7 @@ #include <stdio.h> #include <stdarg.h> #include <stdlib.h> +#include <string.h> #include <math.h> #define STR_IMP(x) #x @@ -69,6 +70,9 @@ #define LILY_LOCATION ((__FILE__ ":" STR(__LINE__)) + SOURCE_PATH_SIZE) #endif +#define LILY_NULLSAFE(x) (x==NULL ? "(nil)" : x) +int lily_streq(const char *str1, const char *str2); + /* self-location macro */ #ifndef LILY_TEST_H_LOCATION @@ -161,7 +165,7 @@ void lily_check(int x, const char *location, const char *fmt, ...); #define CHECK_EQF(x, y, fmt) LILY_CHECK_EQF(x, y, #x, #y, fmt) #define LILY_CHECK_EQS(x, y, xstr, ystr) \ - lily_check(strcmp(x, y) == 0, LILY_LOCATION, \ + lily_check(lily_streq(x, y), LILY_LOCATION, \ "CHECK failed: %s == %s\n %s = \"%s\"\n %s = \"%s\"", \ xstr, ystr, xstr, x, ystr, y) #define CHECK_EQS(x, y) LILY_CHECK_EQS(x, y, #x, #y) @@ -194,7 +198,7 @@ void lily_require(int x, const char *location, const char *fmt, ...); #define REQUIRE_EQF(x, y, fmt) LILY_REQUIRE_EQF(x, y, #x, #y, fmt) #define LILY_REQUIRE_EQS(x, y, xstr, ystr) \ - lily_require(strcmp(x, y) == 0, LILY_LOCATION, \ + lily_require(lily_streq(x, y), LILY_LOCATION, \ "REQUIRE failed: %s == %s\n %s = \"%s\"\n %s = \"%s\"", \ xstr, ystr, xstr, x, ystr, y) #define REQUIRE_EQS(x, y) LILY_REQUIRE_EQS(x, y, #x, #y) @@ -278,10 +282,10 @@ void lily_run_test(void (*test)()) if (lily_g.failed) { lily_g.n_tests_failed += 1; printf("================================================================================\n"); - printf("test \"%s\" failed!\n\n", lily_g.test_name); + printf("test \"%s\" failed!\n", lily_g.test_name); lily_test_msg_t *n = lily_g.HEAD.next; while(n != NULL) { - printf(" %s\n [%s]\n\n", n->msg, n->location); + printf(" %s\n [%s]\n", n->msg, n->location); n = n->next; } lily_msg_destroy(lily_g.HEAD.next); @@ -368,6 +372,23 @@ void lily_set_epsilon(double epsilon) { lily_g.epsilon = epsilon; } + + +int lily_streq(const char *str1, const char *str2) +{ + if (str1 == NULL && str2 == NULL) { + /* both are null (and therefore equal, i guess) */ + return 1; + } + + if (str1 == NULL || str2 == NULL) { + /* only one is null */ + return 0; + } + + /* neither are null, check normal string equality */ + return strcmp(str1, str2) == 0; +} #endif /* ifdef LILY_TEST_H */ |