From 5faf642b9c89b5f547f2c16cb268205ec7c5117c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 9 Sep 2015 13:23:20 +0200 Subject: [PATCH] use the same DISABLE_TEST macro everywhere. --- src/direction.test.c | 4 +--- src/keyword.test.c | 4 +--- src/skill.test.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/direction.test.c b/src/direction.test.c index 54ae5a6bb..fb346cb4e 100644 --- a/src/direction.test.c +++ b/src/direction.test.c @@ -57,15 +57,13 @@ static void test_get_direction_default(CuTest *tc) { CuAssertIntEquals(tc, D_EAST, get_direction("east", lang)); } -#define SUITE_DISABLE_TEST(suite, test) (void)test - CuSuite *get_direction_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_init_direction); SUITE_ADD_TEST(suite, test_init_directions); SUITE_ADD_TEST(suite, test_finddirection); - SUITE_DISABLE_TEST(suite, test_get_direction_default); + DISABLE_TEST(suite, test_get_direction_default); return suite; } diff --git a/src/keyword.test.c b/src/keyword.test.c index 9aa297009..e0274d9cf 100644 --- a/src/keyword.test.c +++ b/src/keyword.test.c @@ -93,8 +93,6 @@ static void test_get_shortest_match(CuTest *tc) { test_cleanup(); } -#define SUITE_DISABLE_TEST(suite, test) (void)test - CuSuite *get_keyword_suite(void) { CuSuite *suite = CuSuiteNew(); @@ -103,6 +101,6 @@ CuSuite *get_keyword_suite(void) SUITE_ADD_TEST(suite, test_init_keywords); SUITE_ADD_TEST(suite, test_findkeyword); SUITE_ADD_TEST(suite, test_get_shortest_match); - SUITE_DISABLE_TEST(suite, test_get_keyword_default); + DISABLE_TEST(suite, test_get_keyword_default); return suite; } diff --git a/src/skill.test.c b/src/skill.test.c index f2f0cd73a..451f95d7c 100644 --- a/src/skill.test.c +++ b/src/skill.test.c @@ -43,15 +43,13 @@ static void test_get_skill_default(CuTest *tc) { CuAssertIntEquals(tc, SK_CROSSBOW, get_skill("crossbow", lang)); } -#define SUITE_DISABLE_TEST(suite, test) (void)test - CuSuite *get_skill_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_init_skill); SUITE_ADD_TEST(suite, test_init_skills); SUITE_ADD_TEST(suite, test_get_skill); - SUITE_DISABLE_TEST(suite, test_get_skill_default); + DISABLE_TEST(suite, test_get_skill_default); return suite; }