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

verify arguments for volcanooutbreak message.

This commit is contained in:
Enno Rehling 2016-08-27 08:29:01 +01:00
parent 6d5e295678
commit b56c48d95c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/volcano.c
View File

@ -270,7 +270,6 @@ void volcano_update(void)
r->terrain = t_volcano; r->terrain = t_volcano;
} }
else { else {
// TODO: is this code path inactive? are we only keeping it for old data? fix data instead.
if (rng_int() % 100 < 12) { if (rng_int() % 100 < 12) {
ADDMSG(&r->msgs, msg_message("volcanostopsmoke", "region", r)); ADDMSG(&r->msgs, msg_message("volcanostopsmoke", "region", r));
r->terrain = t_volcano; r->terrain = t_volcano;

9
src/volcano.test.c
View File

@ -4,6 +4,7 @@
#include <kernel/region.h> #include <kernel/region.h>
#include <kernel/terrain.h> #include <kernel/terrain.h>
#include <kernel/messages.h>
#include <util/attrib.h> #include <util/attrib.h>
@ -30,20 +31,24 @@ static void test_volcano_update(CuTest *tc) {
static void test_volcano_outbreak(CuTest *tc) { static void test_volcano_outbreak(CuTest *tc) {
region *r, *rn; region *r, *rn;
message *m;
const struct terrain_type *t_volcano, *t_active; const struct terrain_type *t_volcano, *t_active;
test_cleanup(); test_cleanup();
mt_register(mt_new_va("volcanooutbreak", "regionv:region", "regionn:region", 0));
t_volcano = test_create_terrain("volcano", LAND_REGION); t_volcano = test_create_terrain("volcano", LAND_REGION);
t_active = test_create_terrain("activevolcano", LAND_REGION); t_active = test_create_terrain("activevolcano", LAND_REGION);
r = test_create_region(0, 0, t_active); r = test_create_region(0, 0, t_active);
rn = test_create_region(1, 0, t_volcano); rn = test_create_region(1, 0, t_volcano);
volcano_outbreak(r, rn); volcano_outbreak(r, rn);
// CuAssertPtrEquals(tc, (void *)t_volcano, (void *)r->terrain); CuAssertPtrEquals(tc, (void *)t_active, (void *)r->terrain);
CuAssertIntEquals(tc, 0, rtrees(r, 0)); CuAssertIntEquals(tc, 0, rtrees(r, 0));
CuAssertIntEquals(tc, 0, rtrees(r, 1)); CuAssertIntEquals(tc, 0, rtrees(r, 1));
CuAssertIntEquals(tc, 0, rtrees(r, 2)); CuAssertIntEquals(tc, 0, rtrees(r, 2));
CuAssertPtrNotNull(tc, test_find_messagetype(rn->msgs, "volcanooutbreak")); CuAssertPtrNotNull(tc, m = test_find_messagetype(rn->msgs, "volcanooutbreak"));
CuAssertPtrEquals(tc, r, m->parameters[0].v);
CuAssertPtrEquals(tc, rn, m->parameters[1].v);
CuAssertPtrNotNull(tc, a_find(r->attribs, &at_reduceproduction)); CuAssertPtrNotNull(tc, a_find(r->attribs, &at_reduceproduction));
CuAssertPtrNotNull(tc, a_find(rn->attribs, &at_reduceproduction)); CuAssertPtrNotNull(tc, a_find(rn->attribs, &at_reduceproduction));