From cc3c5580d41ea346fd91d4e455ba7cf7932f30e9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 7 Jul 2015 20:23:24 +0200 Subject: [PATCH] rewrite and unit tests --- res/core/messages.xml | 1 + scripts/tests/e2/destroy.lua | 3 ++ src/CMakeLists.txt | 1 + src/spells.c | 3 ++ src/spells/CMakeLists.txt | 1 + src/spells/buildingcurse.c | 5 +-- src/spells/buildingcurse.h | 3 ++ src/spells/magicresistance.c | 25 ++++++++++++++ src/spells/magicresistance.test.c | 56 +++++++++++++++++++++++++++++++ src/spells/unitcurse.c | 5 --- 10 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 src/spells/magicresistance.c create mode 100644 src/spells/magicresistance.test.c diff --git a/res/core/messages.xml b/res/core/messages.xml index 259e73318..22a8ea841 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -392,6 +392,7 @@ + diff --git a/scripts/tests/e2/destroy.lua b/scripts/tests/e2/destroy.lua index 258146941..a4e84330d 100644 --- a/scripts/tests/e2/destroy.lua +++ b/scripts/tests/e2/destroy.lua @@ -17,6 +17,9 @@ function test_dont_move_after_destroy() u:add_order("NACH O") u:add_order("ZERSTOERE " .. itoa36(u.building.id)) process_orders() + if not u.region then + print("shit happened ", u.number) + end assert_equal(r1, u.region) assert_equal(nil, u.building) end diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 71651c1a0..0bbe4f45b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -193,6 +193,7 @@ set(TESTS_SRC spells.test.c spy.test.c upkeep.test.c + spells/magicresistance.test.c ${ATTRIBUTES_TESTS} ${UTIL_TESTS} ${KERNEL_TESTS} diff --git a/src/spells.c b/src/spells.c index b7e1e6868..1d07c2d21 100644 --- a/src/spells.c +++ b/src/spells.c @@ -6767,6 +6767,8 @@ static int sp_readmind(castorder * co) return cast_level; } +void register_magicresistance(void); + void register_spells(void) { register_borders(); @@ -6793,4 +6795,5 @@ void register_spells(void) register_regioncurse(); register_shipcurse(); register_buildingcurse(); + register_magicresistance(); } diff --git a/src/spells/CMakeLists.txt b/src/spells/CMakeLists.txt index 0fbd5c5a0..335189c21 100644 --- a/src/spells/CMakeLists.txt +++ b/src/spells/CMakeLists.txt @@ -7,6 +7,7 @@ combatspells.c regioncurse.c shipcurse.c unitcurse.c +magicresistance.c ) FOREACH(_FILE ${_FILES}) LIST(APPEND _SOURCES ${PROJECT_NAME}/${_FILE}) diff --git a/src/spells/buildingcurse.c b/src/spells/buildingcurse.c index 0f7a17f5b..ae2f941bb 100644 --- a/src/spells/buildingcurse.c +++ b/src/spells/buildingcurse.c @@ -33,14 +33,15 @@ #include #include -static message *cinfo_building(const void *obj, objtype_t typ, const curse * c, +message *cinfo_building(const void *obj, objtype_t typ, const curse * c, int self) { unused_arg(typ); assert(typ == TYP_BUILDING); if (self != 0) { /* owner or inside */ - return msg_message(mkname("curseinfo", c->type->cname), "id", c->no); + building *b = (building *)obj; + return msg_message(mkname("curseinfo", c->type->cname), "id building", c->no, b); } return msg_message(mkname("curseinfo", "buildingunknown"), "id", c->no); } diff --git a/src/spells/buildingcurse.h b/src/spells/buildingcurse.h index d6366c920..46989829a 100644 --- a/src/spells/buildingcurse.h +++ b/src/spells/buildingcurse.h @@ -13,14 +13,17 @@ #ifndef _BCURSE_H #define _BCURSE_H +#include #ifdef __cplusplus extern "C" { #endif struct locale; struct curse; + struct message; extern void register_buildingcurse(void); + struct message *cinfo_building(const void *obj, objtype_t typ, const struct curse * c, int self); #ifdef __cplusplus } diff --git a/src/spells/magicresistance.c b/src/spells/magicresistance.c new file mode 100644 index 000000000..3ec15011c --- /dev/null +++ b/src/spells/magicresistance.c @@ -0,0 +1,25 @@ +#include +#include +#include "unitcurse.h" +#include "buildingcurse.h" +#include + +static struct message *cinfo_magicresistance(const void *obj, objtype_t typ, const struct curse * c, int self) +{ + if (typ == TYP_UNIT) { + return cinfo_unit(obj, typ, c, self); + } + if (typ == TYP_BUILDING) { + return cinfo_building(obj, typ, c, self); + } + return 0; +} + +static struct curse_type ct_magicresistance = { + "magicresistance", CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, cinfo_magicresistance +}; + +void register_magicresistance(void) +{ + ct_register(&ct_magicresistance); +} diff --git a/src/spells/magicresistance.test.c b/src/spells/magicresistance.test.c new file mode 100644 index 000000000..bd2d4b69b --- /dev/null +++ b/src/spells/magicresistance.test.c @@ -0,0 +1,56 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "spells.h" + +#include +#include + +#include +#include +#include +#include + + +static struct castorder *test_create_castorder(castorder *order, unit *u, const char *name, int level, float force, int range) { + struct locale * lang; + spell *sp; + + lang = get_or_create_locale("en"); + sp = create_spell(name, 0); + return order = create_castorder(order, u, NULL, sp, u->region, level, force, range, create_order(K_CAST, lang, ""), NULL); +} + +static void test_magicresistance(CuTest *tc) { + struct region *r; + struct faction *f1, *f2; + unit *u1, *u2; + int level; + curse *c; + + test_cleanup(); + test_create_world(); + r=findregion(0, 0); + f1 = test_create_faction(test_create_race("human")); + u1 = test_create_unit(f1, r); + + f2 = test_create_faction(test_create_race("human")); + u2 = test_create_unit(f2, r); + + test_cleanup(); +} + +CuSuite *get_magicresistance_suite(void) +{ + CuSuite *suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, test_magicresistance); + return suite; +} diff --git a/src/spells/unitcurse.c b/src/spells/unitcurse.c index 80ebe56bb..7e3f5e18e 100644 --- a/src/spells/unitcurse.c +++ b/src/spells/unitcurse.c @@ -301,10 +301,6 @@ static struct curse_type ct_oldrace = { "oldrace", CURSETYP_NORM, CURSE_SPREADALWAYS, NO_MERGE, NULL }; -static struct curse_type ct_magicresistance = { - "magicresistance", CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, cinfo_unit -}; - /* ------------------------------------------------------------- */ /* * C_SKILL @@ -365,5 +361,4 @@ void register_unitcurse(void) ct_register(&ct_itemcloak); ct_register(&ct_fumble); ct_register(&ct_oldrace); - ct_register(&ct_magicresistance); }