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

avoid using test_create_world.

Browse source
This commit is contained in:
Enno Rehling 2017-12-27 22:38:14 +01:00
parent f6753261cd
commit 3c1addf2ba
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/laws.test.c
View file

@ -309,7 +309,7 @@ static void test_force_leave_ships_on_ocean(CuTest *tc) {
ship *sh; ship *sh;
test_setup(); test_setup();
r = test_create_region(0, 0, test_create_terrain("ocean", SEA_REGION)); r = test_create_ocean(0, 0);
u1 = test_create_unit(test_create_faction(NULL), r); u1 = test_create_unit(test_create_faction(NULL), r);
u2 = test_create_unit(test_create_faction(NULL), r); u2 = test_create_unit(test_create_faction(NULL), r);
sh = test_create_ship(r, NULL); sh = test_create_ship(r, NULL);
@ -323,94 +323,89 @@ static void test_force_leave_ships_on_ocean(CuTest *tc) {
static void test_fishing_feeds_2_people(CuTest * tc) static void test_fishing_feeds_2_people(CuTest * tc)
{ {
const resource_type *rtype; const item_type *itype;
region *r; region *r;
faction *f; faction *f;
unit *u; unit *u;
ship *sh; ship *sh;
test_setup(); test_setup();
test_create_world(); r = test_create_ocean(0, 0);
r = findregion(-1, 0);
CuAssertStrEquals(tc, "ocean", r->terrain->_name); /* test_create_world needs coverage */
f = test_create_faction(NULL); f = test_create_faction(NULL);
u = test_create_unit(f, r); u = test_create_unit(f, r);
sh = new_ship(st_find("boat"), r, 0); sh = test_create_ship(r, NULL);
u_set_ship(u, sh); u_set_ship(u, sh);
rtype = get_resourcetype(R_SILVER); itype = test_create_silver();
i_change(&u->items, rtype->itype, 42); i_change(&u->items, itype, 42);
scale_number(u, 1); scale_number(u, 1);
sh->flags |= SF_FISHING; sh->flags |= SF_FISHING;
get_food(r); get_food(r);
CuAssertIntEquals(tc, 42, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 42, i_get(u->items, itype));
scale_number(u, 2); scale_number(u, 2);
sh->flags |= SF_FISHING; sh->flags |= SF_FISHING;
get_food(r); get_food(r);
CuAssertIntEquals(tc, 42, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 42, i_get(u->items, itype));
scale_number(u, 3); scale_number(u, 3);
sh->flags |= SF_FISHING; sh->flags |= SF_FISHING;
get_food(r); get_food(r);
CuAssertIntEquals(tc, 32, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 32, i_get(u->items, itype));
test_teardown(); test_teardown();
} }
static void test_fishing_does_not_give_goblins_money(CuTest * tc) static void test_fishing_does_not_give_goblins_money(CuTest * tc)
{ {
const resource_type *rtype; const item_type *itype;
region *r; region *r;
faction *f; faction *f;
unit *u; unit *u;
ship *sh; ship *sh;
test_setup(); test_setup();
test_create_world(); itype = test_create_silver();
rtype = get_resourcetype(R_SILVER);
r = findregion(-1, 0); r = test_create_ocean(0, 0);
CuAssertStrEquals(tc, "ocean", r->terrain->_name); /* test_create_world needs coverage */
f = test_create_faction(NULL); f = test_create_faction(NULL);
u = test_create_unit(f, r); u = test_create_unit(f, r);
sh = new_ship(st_find("boat"), r, 0); sh = test_create_ship(r, NULL);
u_set_ship(u, sh); u_set_ship(u, sh);
i_change(&u->items, rtype->itype, 42); i_change(&u->items, itype, 42);
scale_number(u, 2); scale_number(u, 2);
sh->flags |= SF_FISHING; sh->flags |= SF_FISHING;
get_food(r); get_food(r);
CuAssertIntEquals(tc, 42, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 42, i_get(u->items, itype));
test_teardown(); test_teardown();
} }
static void test_fishing_gets_reset(CuTest * tc) static void test_fishing_gets_reset(CuTest * tc)
{ {
const resource_type *rtype; const item_type *itype;
region *r; region *r;
faction *f; faction *f;
unit *u; unit *u;
ship *sh; ship *sh;
test_setup(); test_setup();
test_create_world(); itype = test_create_silver();
rtype = get_resourcetype(R_SILVER);
r = findregion(-1, 0); r = test_create_ocean(0, 0);
CuAssertStrEquals(tc, "ocean", r->terrain->_name); /* test_create_world needs coverage */
f = test_create_faction(NULL); f = test_create_faction(NULL);
u = test_create_unit(f, r); u = test_create_unit(f, r);
sh = new_ship(st_find("boat"), r, 0); sh = test_create_ship(r, NULL);
u_set_ship(u, sh); u_set_ship(u, sh);
i_change(&u->items, rtype->itype, 42); i_change(&u->items, itype, 42);
scale_number(u, 1); scale_number(u, 1);
sh->flags |= SF_FISHING; sh->flags |= SF_FISHING;
get_food(r); get_food(r);
CuAssertIntEquals(tc, 42, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 42, i_get(u->items, itype));
scale_number(u, 1); scale_number(u, 1);
get_food(r); get_food(r);
CuAssertIntEquals(tc, 32, i_get(u->items, rtype->itype)); CuAssertIntEquals(tc, 32, i_get(u->items, itype));
test_teardown(); test_teardown();
} }