Mercurial > hg > th-libs
diff tests.c @ 457:85fa3d333556
Actually, revert the boolean changes .. meh.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 02 Jan 2018 23:09:29 +0200 |
| parents | efd33accdc81 |
| children | 6d44592cdab1 |
line wrap: on
line diff
--- a/tests.c Tue Jan 02 22:57:47 2018 +0200 +++ b/tests.c Tue Jan 02 23:09:29 2018 +0200 @@ -23,7 +23,7 @@ typedef struct { char *header, *res; - bool shown; + BOOL shown; } test_ctx; @@ -47,21 +47,21 @@ static const int arg_nopts = sizeof(arg_opts) / sizeof(arg_opts[0]); -bool tprintv(const int level, const char *fmt, va_list ap) +BOOL tprintv(const int level, const char *fmt, va_list ap) { if (level <= th_verbosityLevel) { vfprintf(stdout, fmt, ap); - return true; + return TRUE; } else - return false; + return FALSE; } -bool tprint(const int level, const char *fmt, ...) +BOOL tprint(const int level, const char *fmt, ...) { - bool retv; + BOOL retv; va_list ap; va_start(ap, fmt); retv = tprintv(level, fmt, ap); @@ -77,7 +77,7 @@ } -bool arg_handle_opt(const int optN, char *optArg, char *currArg) +BOOL arg_handle_opt(const int optN, char *optArg, char *currArg) { switch (optN) { @@ -92,7 +92,7 @@ case 2: { - bool ret = true; + BOOL ret = TRUE; char *pos, *pstr, *next; pos = pstr = th_strdup(optArg); memset(sets_enabled, 0, sizeof(sets_enabled)); @@ -111,7 +111,7 @@ else { THERR("Invalid test number #%d, out of range [%d .. %d]\n", val, 1, SET_MAX_TESTS); - ret = false; + ret = FALSE; } th_free(tmp); } @@ -130,10 +130,10 @@ default: THERR("Unknown option '%s'.\n", currArg); - return false; + return FALSE; } - return true; + return TRUE; } @@ -167,19 +167,19 @@ } -void test_result_msg_v(test_ctx *ctx, bool check, const char *fmt, va_list ap) +void test_result_msg_v(test_ctx *ctx, BOOL check, const char *fmt, va_list ap) { if (check) { if (!ctx->shown && tprint(2, "%s: OK\n", ctx->header)) - ctx->shown = true; + ctx->shown = TRUE; tests_passed++; } else { if (!ctx->shown && tprint(0, "%s: FAIL\n", ctx->header)) - ctx->shown = true; + ctx->shown = TRUE; if (fmt != NULL) { @@ -194,7 +194,7 @@ } -bool test_result_msg(test_ctx *ctx, bool check, const char *fmt, ...) +BOOL test_result_msg(test_ctx *ctx, BOOL check, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -204,7 +204,7 @@ } -bool test_result(test_ctx *ctx, bool check) +BOOL test_result(test_ctx *ctx, BOOL check) { test_result_msg_v(ctx, check, NULL, NULL); return check; @@ -275,7 +275,7 @@ } -bool test_set_start(const char *str) +BOOL test_set_start(const char *str) { if (sets_enabled[sets_total++]) { @@ -286,10 +286,10 @@ "======================================================\n", sets_total, str); - return true; + return TRUE; } else - return false; + return FALSE; } @@ -444,52 +444,52 @@ // if (test_set_start("String matching #1")) { - TEST2(th_strcasecmp, "aSdFq", "asdfq", true); - TEST2(th_strcasecmp, "aSdFq", "asFfq", false); - TEST2(th_strcasecmp, "abcde", "abcde", true); - TEST2(th_strcasecmp, "öäå", "öäå", true); - TEST2(th_strcasecmp, "aöäå", "aöäå", true); + TEST2(th_strcasecmp, "aSdFq", "asdfq", TRUE); + TEST2(th_strcasecmp, "aSdFq", "asFfq", FALSE); + TEST2(th_strcasecmp, "abcde", "abcde", TRUE); + TEST2(th_strcasecmp, "öäå", "öäå", TRUE); + TEST2(th_strcasecmp, "aöäå", "aöäå", TRUE); } if (test_set_start("String matching #2")) { - TEST3(th_strncasecmp, "aSdFq", "asFfqB", 4, false); - TEST3(th_strncasecmp, "aSdFq", "asFfqQ", 2, true); - TEST3(th_strncasecmp, "aSdFq", "asDfq", 3, true); - TEST3(th_strncasecmp, "aSdFq", "asDfq", 2, true); - TEST3(th_strncasecmp, "aSdFq", "asDfq", 0, true); - TEST3(th_strncasecmp, "aSdFq", "QsDfq", 0, true); - TEST3(th_strncasecmp, "aSdFq", "QsDfq", 1, false); + TEST3(th_strncasecmp, "aSdFq", "asFfqB", 4, FALSE); + TEST3(th_strncasecmp, "aSdFq", "asFfqQ", 2, TRUE); + TEST3(th_strncasecmp, "aSdFq", "asDfq", 3, TRUE); + TEST3(th_strncasecmp, "aSdFq", "asDfq", 2, TRUE); + TEST3(th_strncasecmp, "aSdFq", "asDfq", 0, TRUE); + TEST3(th_strncasecmp, "aSdFq", "QsDfq", 0, TRUE); + TEST3(th_strncasecmp, "aSdFq", "QsDfq", 1, FALSE); } if (test_set_start("String matching #3")) { - TEST2B(th_strmatch, "abba ABBAkukka lol", "*lol", true); - TEST2B(th_strmatch, "abba ABBAkukka lol", "*lo*", true); - TEST2B(th_strmatch, "abba ABBAkukka lol", "*lo", false); - TEST2B(th_strmatch, "abba ABBAkukka lol", "abba", false); - TEST2B(th_strmatch, "abba ABBAkukka lol", "*bba*", true); - TEST2B(th_strmatch, "abba ABBAkukka lol", "abba*", true); - TEST2B(th_strmatch, "abba ABBAkukka lol", "abbak*", false); - TEST2B(th_strmatch, "abba ABBAöökukka lol", "*abbaö?", false); + TEST2B(th_strmatch, "abba ABBAkukka lol", "*lol", TRUE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "*lo*", TRUE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "*lo", FALSE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "abba", FALSE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "*bba*", TRUE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "abba*", TRUE); + TEST2B(th_strmatch, "abba ABBAkukka lol", "abbak*", FALSE); + TEST2B(th_strmatch, "abba ABBAöökukka lol", "*abbaö?", FALSE); } if (test_set_start("String matching #4")) { - TEST2B(th_strcasematch, "abba ABBAkukka lol", "abbak*", false); - TEST2B(th_strcasematch, "abba ABBAkukka lol", "*abbak*", true); - TEST2B(th_strcasematch, "abba ABBAkukka lol", "*ab?ak*", true); - TEST2B(th_strcasematch, "abba ABBAkukka lol", "*abbak?", false); - TEST2B(th_strcasematch, "abba ABBAkukka lol", "?bba?abba*", true); + TEST2B(th_strcasematch, "abba ABBAkukka lol", "abbak*", FALSE); + TEST2B(th_strcasematch, "abba ABBAkukka lol", "*abbak*", TRUE); + TEST2B(th_strcasematch, "abba ABBAkukka lol", "*ab?ak*", TRUE); + TEST2B(th_strcasematch, "abba ABBAkukka lol", "*abbak?", FALSE); + TEST2B(th_strcasematch, "abba ABBAkukka lol", "?bba?abba*", TRUE); } // Tests that test for things that do not work correctly yet // Unicode / multibyte UTF-8 causes problems here if (test_set_start("Invalid")) { - TEST2(th_strcasecmp, "ÖÄÅ", "öäå", false); // SHOULD match - TEST3(th_strncasecmp, "Aäöå", "aöå", 2, true); // should NOT match - TEST2B(th_strmatch, "öriÖRI! lol", "?ri?RI!*", false); // should match + TEST2(th_strcasecmp, "ÖÄÅ", "öäå", FALSE); // SHOULD match + TEST3(th_strncasecmp, "Aäöå", "aöå", 2, TRUE); // should NOT match + TEST2B(th_strmatch, "öriÖRI! lol", "?ri?RI!*", FALSE); // should match } //