From b56c48d95c05bf3bc088a49ebca6873273c45fd8 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 27 Aug 2016 08:29:01 +0100 Subject: [PATCH] verify arguments for volcanooutbreak message. --- src/volcano.c | 1 - src/volcano.test.c | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/volcano.c b/src/volcano.c index 9fb19dffd..910bd8775 100644 --- a/src/volcano.c +++ b/src/volcano.c @@ -270,7 +270,6 @@ void volcano_update(void) r->terrain = t_volcano; } else { - // TODO: is this code path inactive? are we only keeping it for old data? fix data instead. if (rng_int() % 100 < 12) { ADDMSG(&r->msgs, msg_message("volcanostopsmoke", "region", r)); r->terrain = t_volcano; diff --git a/src/volcano.test.c b/src/volcano.test.c index dd644cd22..091628cb7 100644 --- a/src/volcano.test.c +++ b/src/volcano.test.c @@ -4,6 +4,7 @@ #include #include +#include #include @@ -30,20 +31,24 @@ static void test_volcano_update(CuTest *tc) { static void test_volcano_outbreak(CuTest *tc) { region *r, *rn; + message *m; const struct terrain_type *t_volcano, *t_active; test_cleanup(); + mt_register(mt_new_va("volcanooutbreak", "regionv:region", "regionn:region", 0)); t_volcano = test_create_terrain("volcano", LAND_REGION); t_active = test_create_terrain("activevolcano", LAND_REGION); r = test_create_region(0, 0, t_active); rn = test_create_region(1, 0, t_volcano); 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, 1)); 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(rn->attribs, &at_reduceproduction));