mirror of
https://github.com/git/git
synced 2024-10-05 16:19:28 +00:00
t-prio-queue: simplify using compound literals
Test names like "basic" are mentioned seven times in the code (ignoring case): Twice when defining the input and result macros, thrice when defining the test function, and twice again when calling it. Reduce that to a single time by using compound literals to pass the input and result arrays via TEST_INPUT to test_prio_queue(). Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c2cbfbd2e2
commit
543b2a1083
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue