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

add another failing test for bug 1685 

add test for forbiddenid (cannot have a unit with id TEMP)
This commit is contained in:
Enno Rehling 2015-09-05 19:25:55 +02:00
parent 74d7caf526
commit 400b8f1ffa
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/config.c
View File

@ -842,6 +842,7 @@ building *largestbuilding(const region * r, cmp_building_cb cmp_gt,
extern faction *dfindhash(int i); extern faction *dfindhash(int i);
static const char *forbidden[] = { "t", "te", "tem", "temp", NULL }; static const char *forbidden[] = { "t", "te", "tem", "temp", NULL };
// PEASANT: "b", "ba", "bau", "baue", "p", "pe", "pea", "peas"
int forbiddenid(int id) int forbiddenid(int id)
{ {

18
src/kernel/config.test.c
View File

@ -53,6 +53,13 @@ static void test_getunit(CuTest *tc) {
CuAssertPtrEquals(tc, NULL, u2); CuAssertPtrEquals(tc, NULL, u2);
free_order(ord); free_order(ord);
// bug https://bugs.eressea.de/view.php?id=1685
ord = create_order(K_GIVE, lang, "##");
init_order(ord);
CuAssertIntEquals(tc, GET_NOTFOUND, getunit(u->region, u->faction, &u2));
CuAssertPtrEquals(tc, NULL, u2);
free_order(ord);
ord = create_order(K_GIVE, lang, "TEMP 42"); ord = create_order(K_GIVE, lang, "TEMP 42");
init_order(ord); init_order(ord);
CuAssertIntEquals(tc, GET_UNIT, getunit(u->region, u->faction, &u2)); CuAssertIntEquals(tc, GET_UNIT, getunit(u->region, u->faction, &u2));
@ -97,9 +104,20 @@ static void test_param_flt(CuTest * tc)
CuAssertDblEquals(tc, 42.0, get_param_flt(par, "bar", 0.0), 0.01); CuAssertDblEquals(tc, 42.0, get_param_flt(par, "bar", 0.0), 0.01);
} }
static void test_forbiddenid(CuTest *tc) {
CuAssertIntEquals(tc, 0, forbiddenid(1));
CuAssertIntEquals(tc, 1, forbiddenid(0));
CuAssertIntEquals(tc, 1, forbiddenid(-1));
CuAssertIntEquals(tc, 1, forbiddenid(atoi36("temp")));
CuAssertIntEquals(tc, 1, forbiddenid(atoi36("tem")));
CuAssertIntEquals(tc, 1, forbiddenid(atoi36("te")));
CuAssertIntEquals(tc, 1, forbiddenid(atoi36("t")));
}
CuSuite *get_config_suite(void) CuSuite *get_config_suite(void)
{ {
CuSuite *suite = CuSuiteNew(); CuSuite *suite = CuSuiteNew();
SUITE_ADD_TEST(suite, test_forbiddenid);
SUITE_ADD_TEST(suite, test_getunit); SUITE_ADD_TEST(suite, test_getunit);
SUITE_ADD_TEST(suite, test_get_set_param); SUITE_ADD_TEST(suite, test_get_set_param);
SUITE_ADD_TEST(suite, test_param_int); SUITE_ADD_TEST(suite, test_param_int);