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

WIP: finish removing GUARD_* flags 

TODO: fix failing tests
This commit is contained in:
Enno Rehling 2016-10-31 09:40:36 +01:00
parent 754ad78db7
commit 0bcb3a853f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/guard.test.c
View File

@ -27,9 +27,9 @@ static void test_is_guarded(CuTest *tc) {
r = test_create_region(0, 0, 0); r = test_create_region(0, 0, 0);
u1 = test_create_unit(test_create_faction(0), r); u1 = test_create_unit(test_create_faction(0), r);
u2 = test_create_unit(test_create_faction(rc), r); u2 = test_create_unit(test_create_faction(rc), r);
CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_ALL)); CuAssertPtrEquals(tc, 0, is_guarded(r, u1));
guard(u2, GUARD_ALL); setguard(u2, true);
CuAssertPtrEquals(tc, u2, is_guarded(r, u1, GUARD_ALL)); CuAssertPtrEquals(tc, u2, is_guarded(r, u1));
test_cleanup(); test_cleanup();
} }
@ -49,7 +49,7 @@ static void test_guard_unskilled(CuTest * tc)
i_change(&ug->items, itype, 1); i_change(&ug->items, itype, 1);
set_level(ug, SK_MELEE, 1); set_level(ug, SK_MELEE, 1);
setguard(ug, true); setguard(ug, true);
CuAssertPtrEquals(tc, 0, is_guarded(r, u, GUARD_PRODUCE)); CuAssertPtrEquals(tc, 0, is_guarded(r, u));
test_cleanup(); test_cleanup();
} }
@ -68,7 +68,7 @@ static void test_guard_armed(CuTest * tc)
i_change(&ug->items, itype, 1); i_change(&ug->items, itype, 1);
set_level(ug, SK_MELEE, 2); set_level(ug, SK_MELEE, 2);
setguard(ug, true); setguard(ug, true);
CuAssertPtrEquals(tc, ug, is_guarded(r, u, GUARD_PRODUCE)); CuAssertPtrEquals(tc, ug, is_guarded(r, u));
test_cleanup(); test_cleanup();
} }
@ -87,13 +87,13 @@ static void test_is_guard(CuTest * tc)
set_level(ug, SK_MELEE, 2); set_level(ug, SK_MELEE, 2);
setguard(ug, true); setguard(ug, true);
CuAssertIntEquals(tc, 1, armedmen(ug, false)); CuAssertIntEquals(tc, 1, armedmen(ug, false));
CuAssertTrue(tc, is_guard(ug, GUARD_RECRUIT)); CuAssertTrue(tc, is_guard(ug));
set_level(ug, SK_MELEE, 1); set_level(ug, SK_MELEE, 1);
CuAssertIntEquals(tc, 0, armedmen(ug, false)); CuAssertIntEquals(tc, 0, armedmen(ug, false));
CuAssertTrue(tc, !is_guard(ug, GUARD_RECRUIT)); CuAssertTrue(tc, !is_guard(ug));
set_level(ug, SK_MELEE, 2); set_level(ug, SK_MELEE, 2);
CuAssertIntEquals(tc, 1, armedmen(ug, false)); CuAssertIntEquals(tc, 1, armedmen(ug, false));
CuAssertTrue(tc, is_guard(ug, GUARD_RECRUIT)); CuAssertTrue(tc, is_guard(ug));
test_cleanup(); test_cleanup();
} }
@ -110,7 +110,7 @@ static void test_guard_unarmed(CuTest * tc)
u = test_create_unit(test_create_faction(0), r); u = test_create_unit(test_create_faction(0), r);
ug = test_create_unit(test_create_faction(rc), r); ug = test_create_unit(test_create_faction(rc), r);
setguard(ug, true); setguard(ug, true);
CuAssertPtrEquals(tc, ug, is_guarded(r, u, GUARD_PRODUCE)); CuAssertPtrEquals(tc, ug, is_guarded(r, u));
test_cleanup(); test_cleanup();
} }
@ -124,7 +124,7 @@ static void test_guard_monsters(CuTest * tc)
u = test_create_unit(test_create_faction(0), r); u = test_create_unit(test_create_faction(0), r);
ug = test_create_unit(get_monsters(), r); ug = test_create_unit(get_monsters(), r);
setguard(ug, true); setguard(ug, true);
CuAssertPtrEquals(tc, ug, is_guarded(r, u, GUARD_PRODUCE)); CuAssertPtrEquals(tc, ug, is_guarded(r, u));
test_cleanup(); test_cleanup();
} }

4
src/kernel/build.test.c
View File

@ -318,7 +318,7 @@ unit *test_create_guard(region *r, faction *f, race *rc) {
f = test_create_faction(rc); f = test_create_faction(rc);
} }
ug = test_create_unit(f, r); ug = test_create_unit(f, r);
guard(ug, GUARD_TAX); setguard(ug, true);
return ug; return ug;
} }
@ -345,7 +345,7 @@ static void test_build_destroy_road_guard(CuTest *tc)
CuAssertPtrEquals(tc, 0, test_find_messagetype(f->msgs, "destroy_road")); CuAssertPtrEquals(tc, 0, test_find_messagetype(f->msgs, "destroy_road"));
test_clear_messages(f); test_clear_messages(f);
guard(ug, GUARD_NONE); setguard(ug, true);
CuAssertIntEquals(tc, 0, destroy_cmd(u, ord)); CuAssertIntEquals(tc, 0, destroy_cmd(u, ord));
CuAssertIntEquals(tc, 99, rroad(r, D_EAST)); CuAssertIntEquals(tc, 99, rroad(r, D_EAST));