diff options
Diffstat (limited to 't/unit-tests')
| -rw-r--r-- | t/unit-tests/t-basic.c | 95 | ||||
| -rw-r--r-- | t/unit-tests/t-prio-queue.c | 51 |
2 files changed, 17 insertions, 129 deletions
diff --git a/t/unit-tests/t-basic.c b/t/unit-tests/t-basic.c deleted file mode 100644 index fda1ae59a6..0000000000 --- a/t/unit-tests/t-basic.c +++ /dev/null @@ -1,95 +0,0 @@ -#include "test-lib.h" - -/* - * The purpose of this "unit test" is to verify a few invariants of the unit - * test framework itself, as well as to provide examples of output from actually - * failing tests. As such, it is intended that this test fails, and thus it - * should not be run as part of `make unit-tests`. Instead, we verify it behaves - * as expected in the integration test t0080-unit-test-output.sh - */ - -/* Used to store the return value of check_int(). */ -static int check_res; - -/* Used to store the return value of TEST(). */ -static int test_res; - -static void t_res(int expect) -{ - check_int(check_res, ==, expect); - check_int(test_res, ==, expect); -} - -static void t_todo(int x) -{ - check_res = TEST_TODO(check(x)); -} - -static void t_skip(void) -{ - check(0); - test_skip("missing prerequisite"); - check(1); -} - -static int do_skip(void) -{ - test_skip("missing prerequisite"); - return 1; -} - -static void t_skip_todo(void) -{ - check_res = TEST_TODO(do_skip()); -} - -static void t_todo_after_fail(void) -{ - check(0); - TEST_TODO(check(0)); -} - -static void t_fail_after_todo(void) -{ - check(1); - TEST_TODO(check(0)); - check(0); -} - -static void t_messages(void) -{ - check_str("\thello\\", "there\"\n"); - check_str("NULL", NULL); - check_char('a', ==, '\n'); - check_char('\\', ==, '\''); -} - -static void t_empty(void) -{ - ; /* empty */ -} - -int cmd_main(int argc, const char **argv) -{ - test_res = TEST(check_res = check_int(1, ==, 1), "passing test"); - TEST(t_res(1), "passing test and assertion return 1"); - test_res = TEST(check_res = check_int(1, ==, 2), "failing test"); - TEST(t_res(0), "failing test and assertion return 0"); - test_res = TEST(t_todo(0), "passing TEST_TODO()"); - TEST(t_res(1), "passing TEST_TODO() returns 1"); - test_res = TEST(t_todo(1), "failing TEST_TODO()"); - TEST(t_res(0), "failing TEST_TODO() returns 0"); - test_res = TEST(t_skip(), "test_skip()"); - TEST(check_int(test_res, ==, 1), "skipped test returns 1"); - test_res = TEST(t_skip_todo(), "test_skip() inside TEST_TODO()"); - TEST(t_res(1), "test_skip() inside TEST_TODO() returns 1"); - test_res = TEST(t_todo_after_fail(), "TEST_TODO() after failing check"); - TEST(check_int(test_res, ==, 0), "TEST_TODO() after failing check returns 0"); - test_res = TEST(t_fail_after_todo(), "failing check after TEST_TODO()"); - TEST(check_int(test_res, ==, 0), "failing check after TEST_TODO() returns 0"); - TEST(t_messages(), "messages from failing string and char comparison"); - test_res = TEST(t_empty(), "test with no checks"); - TEST(check_int(test_res, ==, 0), "test with no checks returns 0"); - - return test_done(); -} diff --git a/t/unit-tests/t-prio-queue.c b/t/unit-tests/t-prio-queue.c index 5358346361..7a4e5780e1 100644 --- a/t/unit-tests/t-prio-queue.c +++ b/t/unit-tests/t-prio-queue.c @@ -66,43 +66,26 @@ static void test_prio_queue(int *input, size_t input_size, clear_prio_queue(&pq); } -#define BASIC_INPUT 2, 6, 3, 10, 9, 5, 7, 4, 5, 8, 1, DUMP -#define BASIC_RESULT 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10 - -#define MIXED_PUT_GET_INPUT 6, 2, 4, GET, 5, 3, GET, GET, 1, DUMP -#define MIXED_PUT_GET_RESULT 2, 3, 4, 1, 5, 6 - -#define EMPTY_QUEUE_INPUT 1, 2, GET, GET, GET, 1, 2, GET, GET, GET -#define EMPTY_QUEUE_RESULT 1, 2, MISSING, 1, 2, MISSING - -#define STACK_INPUT STACK, 8, 1, 5, 4, 6, 2, 3, DUMP -#define STACK_RESULT 3, 2, 6, 4, 5, 1, 8 - -#define REVERSE_STACK_INPUT STACK, 1, 2, 3, 4, 5, 6, REVERSE, DUMP -#define REVERSE_STACK_RESULT 1, 2, 3, 4, 5, 6 - -#define TEST_INPUT(INPUT, RESULT, name) \ - static void test_##name(void) \ -{ \ - int input[] = {INPUT}; \ - int result[] = {RESULT}; \ - test_prio_queue(input, ARRAY_SIZE(input), \ - result, ARRAY_SIZE(result)); \ -} - -TEST_INPUT(BASIC_INPUT, BASIC_RESULT, basic) -TEST_INPUT(MIXED_PUT_GET_INPUT, MIXED_PUT_GET_RESULT, mixed) -TEST_INPUT(EMPTY_QUEUE_INPUT, EMPTY_QUEUE_RESULT, empty) -TEST_INPUT(STACK_INPUT, STACK_RESULT, stack) -TEST_INPUT(REVERSE_STACK_INPUT, REVERSE_STACK_RESULT, reverse) +#define TEST_INPUT(input, result) \ + test_prio_queue(input, ARRAY_SIZE(input), result, ARRAY_SIZE(result)) int cmd_main(int argc, const char **argv) { - TEST(test_basic(), "prio-queue works for basic input"); - TEST(test_mixed(), "prio-queue works for mixed put & get commands"); - TEST(test_empty(), "prio-queue works when queue is empty"); - TEST(test_stack(), "prio-queue works when used as a LIFO stack"); - TEST(test_reverse(), "prio-queue works when LIFO stack is reversed"); + TEST(TEST_INPUT(((int []){ 2, 6, 3, 10, 9, 5, 7, 4, 5, 8, 1, DUMP }), + ((int []){ 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 10 })), + "prio-queue works for basic input"); + TEST(TEST_INPUT(((int []){ 6, 2, 4, GET, 5, 3, GET, GET, 1, DUMP }), + ((int []){ 2, 3, 4, 1, 5, 6 })), + "prio-queue works for mixed put & get commands"); + TEST(TEST_INPUT(((int []){ 1, 2, GET, GET, GET, 1, 2, GET, GET, GET }), + ((int []){ 1, 2, MISSING, 1, 2, MISSING })), + "prio-queue works when queue is empty"); + TEST(TEST_INPUT(((int []){ STACK, 8, 1, 5, 4, 6, 2, 3, DUMP }), + ((int []){ 3, 2, 6, 4, 5, 1, 8 })), + "prio-queue works when used as a LIFO stack"); + TEST(TEST_INPUT(((int []){ STACK, 1, 2, 3, 4, 5, 6, REVERSE, DUMP }), + ((int []){ 1, 2, 3, 4, 5, 6 })), + "prio-queue works when LIFO stack is reversed"); return test_done(); } |