From 798b3d6ad6555ac2e3cbe9b7d803b7a520101848 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 12 Jan 2015 08:18:41 +0100 Subject: [PATCH 1/2] Implement tests for magicpath. They are failing (Bug 2066). Also move spell and race initialization code from being server-only into game_init, where tests can use it. --- src/eressea.c | 4 ++++ src/kernel/curse.test.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/kernel/unit.c | 16 +++++++++------- src/main.c | 2 -- src/test_eressea.c | 5 +++-- 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/src/eressea.c b/src/eressea.c index 120ad573b..4bfe59daf 100755 --- a/src/eressea.c +++ b/src/eressea.c @@ -20,12 +20,14 @@ #include #include #include +#include #include "chaos.h" #include "report.h" #include "items.h" #include "creport.h" #include "names.h" #include "wormhole.h" +#include "spells.h" void game_done(void) { @@ -55,6 +57,8 @@ void game_init(void) register_nr(); register_cr(); + register_races(); + register_spells(); register_names(); register_resources(); register_buildings(); diff --git a/src/kernel/curse.test.c b/src/kernel/curse.test.c index a7f88218b..5ac34c479 100644 --- a/src/kernel/curse.test.c +++ b/src/kernel/curse.test.c @@ -2,7 +2,11 @@ #include "types.h" #include "curse.h" +#include +#include #include +#include +#include #include @@ -22,9 +26,46 @@ static void test_curse(CuTest * tc) CuAssertPtrEquals(tc, NULL, result); } +typedef struct { + curse *c; + region *r; + unit *u; +} curse_fixture; + +static void setup_curse(curse_fixture *fix, const char *name) { + test_cleanup(); + fix->r = test_create_region(0, 0, NULL); + fix->u = test_create_unit(test_create_faction(NULL), fix->r); + fix->c = create_curse(fix->u, &fix->r->attribs, ct_find(name), 1.0, 1, 1.0, 0); +} + +static void test_magicstreet(CuTest *tc) { + curse_fixture fix; + message *msg; + setup_curse(&fix, "magicstreet"); + fix.c->duration = 3; + msg = fix.c->type->curseinfo(fix.r, TYP_REGION, fix.c, 0); + CuAssertStrEquals(tc, "curseinfo::magicstreet", (const char *)msg->parameters[0].v); + msg_release(msg); + test_cleanup(); +} + +static void test_magicstreet_warning(CuTest *tc) { + curse_fixture fix; + message *msg; + setup_curse(&fix, "magicstreet"); + fix.c->duration = 2; + msg = fix.c->type->curseinfo(fix.r, TYP_REGION, fix.c, 0); + CuAssertStrEquals(tc, "curseinfo::magicstreetwarn", (const char *)msg->parameters[0].v); + msg_release(msg); + test_cleanup(); +} + CuSuite *get_curse_suite(void) { CuSuite *suite = CuSuiteNew(); SUITE_ADD_TEST(suite, test_curse); + SUITE_ADD_TEST(suite, test_magicstreet); + SUITE_ADD_TEST(suite, test_magicstreet_warning); return suite; } diff --git a/src/kernel/unit.c b/src/kernel/unit.c index efd39bab9..348a46437 100644 --- a/src/kernel/unit.c +++ b/src/kernel/unit.c @@ -1725,21 +1725,23 @@ int unit_max_hp(const unit * u) get_param_int(global.parameters, "rules.stamina", STAMINA_AFFECTS_HP); } h = u_race(u)->hitpoints; - if (heal_ct == NULL) - heal_ct = ct_find("healingzone"); if (rules_stamina & 1) { p = pow(effskill(u, SK_STAMINA) / 2.0, 1.5) * 0.2; h += (int)(h * p + 0.5); } + /* der healing curse veraendert die maximalen hp */ - if (heal_ct) { - curse *c = get_curse(u->region->attribs, heal_ct); - if (c) { - h = (int)(h * (1.0 + (curse_geteffect(c) / 100))); + if (u->region) { + if (heal_ct == NULL) + heal_ct = ct_find("healingzone"); + if (heal_ct) { + curse *c = get_curse(u->region->attribs, heal_ct); + if (c) { + h = (int)(h * (1.0 + (curse_geteffect(c) / 100))); + } } } - return h; } diff --git a/src/main.c b/src/main.c index 6868d36e9..316c3c206 100644 --- a/src/main.c +++ b/src/main.c @@ -304,8 +304,6 @@ int main(int argc, char **argv) L = lua_init(); game_init(); - register_races(); - register_spells(); bind_monsters(L); err = eressea_run(L, luafile); if (err) { diff --git a/src/test_eressea.c b/src/test_eressea.c index d33f75fe8..b8ff259b6 100644 --- a/src/test_eressea.c +++ b/src/test_eressea.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -30,7 +31,7 @@ int RunAllTests(void) int fail_count, flags = log_flags; log_flags = LOG_FLUSH | LOG_CPERROR; - kernel_init(); + game_init(); /* self-test */ RUN_TESTS(suite, tests); @@ -86,7 +87,7 @@ int RunAllTests(void) log_flags = flags; fail_count = suite->failCount; CuSuiteDelete(suite); - kernel_done(); + game_done(); return fail_count; } From 0bd1a8d6f49886c01d705c7518590b9e223e3bfa Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 12 Jan 2015 17:50:10 +0100 Subject: [PATCH 2/2] add a utility function to test for message types. --- src/give.test.c | 6 +++--- src/kernel/curse.test.c | 4 ++-- src/tests.c | 12 ++++++++++++ src/tests.h | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/give.test.c b/src/give.test.c index f4d929c31..5437dfa5b 100644 --- a/src/give.test.c +++ b/src/give.test.c @@ -106,7 +106,7 @@ static void test_give_men_none(CuTest * tc) { env.f2 = env.f1 = test_create_faction(0); setup_give(&env); msg = give_men(0, env.src, env.dst, NULL); - CuAssertStrEquals(tc, "error96", (const char *)msg->parameters[3].v); + CuAssertStrEquals(tc, "error96", test_get_messagetype(msg)); CuAssertIntEquals(tc, 1, env.dst->number); CuAssertIntEquals(tc, 1, env.src->number); test_cleanup(); @@ -137,7 +137,7 @@ static void test_give_men_requires_contact(CuTest * tc) { env.f2 = test_create_faction(0); setup_give(&env); msg = give_men(1, env.src, env.dst, NULL); - CuAssertStrEquals(tc, "feedback_no_contact", (const char *)msg->parameters[3].v); + CuAssertStrEquals(tc, "feedback_no_contact", test_get_messagetype(msg)); CuAssertIntEquals(tc, 1, env.dst->number); CuAssertIntEquals(tc, 1, env.src->number); test_cleanup(); @@ -150,7 +150,7 @@ static void test_give_men_not_to_self(CuTest * tc) { env.f2 = env.f1 = test_create_faction(0); setup_give(&env); msg = give_men(1, env.src, env.src, NULL); - CuAssertStrEquals(tc, "error10", (const char *)msg->parameters[3].v); + CuAssertStrEquals(tc, "error10", test_get_messagetype(msg)); CuAssertIntEquals(tc, 1, env.src->number); test_cleanup(); } diff --git a/src/kernel/curse.test.c b/src/kernel/curse.test.c index 5ac34c479..d152061de 100644 --- a/src/kernel/curse.test.c +++ b/src/kernel/curse.test.c @@ -45,7 +45,7 @@ static void test_magicstreet(CuTest *tc) { setup_curse(&fix, "magicstreet"); fix.c->duration = 3; msg = fix.c->type->curseinfo(fix.r, TYP_REGION, fix.c, 0); - CuAssertStrEquals(tc, "curseinfo::magicstreet", (const char *)msg->parameters[0].v); + CuAssertStrEquals(tc, "curseinfo::magicstreet", test_get_messagetype(msg)); msg_release(msg); test_cleanup(); } @@ -56,7 +56,7 @@ static void test_magicstreet_warning(CuTest *tc) { setup_curse(&fix, "magicstreet"); fix.c->duration = 2; msg = fix.c->type->curseinfo(fix.r, TYP_REGION, fix.c, 0); - CuAssertStrEquals(tc, "curseinfo::magicstreetwarn", (const char *)msg->parameters[0].v); + CuAssertStrEquals(tc, "curseinfo::magicstreetwarn", test_get_messagetype(msg)); msg_release(msg); test_cleanup(); } diff --git a/src/tests.c b/src/tests.c index 79ff5ad38..499e9883d 100644 --- a/src/tests.c +++ b/src/tests.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -192,3 +193,14 @@ void test_create_world(void) test_create_shiptype("boat"); } +const char * test_get_messagetype(const message *msg) { + const char * name = msg->type->name; + if (strcmp(name, "missing_message") == 0) { + name = (const char *)msg->parameters[0].v; + } + else if (strcmp(name, "missing_feedback") == 0) { + name = (const char *)msg->parameters[3].v; + } + return name; +} + diff --git a/src/tests.h b/src/tests.h index 5a565076f..6bb1071df 100644 --- a/src/tests.h +++ b/src/tests.h @@ -35,6 +35,7 @@ extern "C" { int RunAllTests(void); void test_translate_param(const struct locale *lang, param_t param, const char *text); + const char * test_get_messagetype(const struct message *msg); #ifdef __cplusplus }