Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/issue-282-link-seen' of github.com:ennorehling/eressea into feature/issue-282-link-seen

This commit is contained in:
Enno Rehling 2015-09-09 11:23:15 +02:00
parent e5a92d6313 f7c1efc287
commit cac22bcb02
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/curse.test.c
View File

@ -156,6 +156,6 @@ CuSuite *get_curse_suite(void)
SUITE_ADD_TEST(suite, test_good_dreams); SUITE_ADD_TEST(suite, test_good_dreams);
SUITE_ADD_TEST(suite, test_bad_dreams); SUITE_ADD_TEST(suite, test_bad_dreams);
SUITE_ADD_TEST(suite, test_memstream); SUITE_ADD_TEST(suite, test_memstream);
SUITE_ADD_TEST(suite, test_write_flag); DISABLE_TEST(suite, test_write_flag);
return suite; return suite;
} }

6
src/seen.test.c
View File

@ -52,11 +52,11 @@ static void test_faction_add_seen(CuTest *tc) {
f = test_create_faction(0); f = test_create_faction(0);
f->seen = seen_init(); f->seen = seen_init();
r = test_create_region(0, 0, 0); r = test_create_region(0, 0, 0);
sr = faction_add_seen(f, r, see_unit);
r = test_create_region(0, 1, 0); r = test_create_region(0, 1, 0);
sr = faction_add_seen(f, regions, see_unit);
CuAssertIntEquals(tc, false, sr->disbelieves); CuAssertIntEquals(tc, false, sr->disbelieves);
CuAssertPtrEquals(tc, regions, f->first); CuAssertPtrEquals(tc, regions, f->first);
CuAssertPtrEquals(tc, r, f->last); CuAssertPtrEquals(tc, regions, f->last);
seen_done(f->seen); seen_done(f->seen);
test_cleanup(); test_cleanup();
} }
@ -189,7 +189,7 @@ CuSuite *get_seen_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_add_seen); SUITE_ADD_TEST(suite, test_add_seen);
DISABLE_TEST(suite, test_faction_add_seen); SUITE_ADD_TEST(suite, test_faction_add_seen);
SUITE_ADD_TEST(suite, test_prepare_seen); SUITE_ADD_TEST(suite, test_prepare_seen);
SUITE_ADD_TEST(suite, test_seen_travelthru); SUITE_ADD_TEST(suite, test_seen_travelthru);
SUITE_ADD_TEST(suite, test_seen_region); SUITE_ADD_TEST(suite, test_seen_region);