From bebc92f82d0eed324356c6035cb026d6c433c7db Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Sat, 31 Oct 2015 19:03:15 +0100 Subject: [PATCH 1/2] expansion of the skillpotion-test test now checks the effect of the potion on the week-counter of sufficiently high skills --- src/items/xerewards.test.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/items/xerewards.test.c b/src/items/xerewards.test.c index 5ce7716f3..1fffaf2d1 100644 --- a/src/items/xerewards.test.c +++ b/src/items/xerewards.test.c @@ -19,13 +19,43 @@ static void test_manacrystal(CuTest *tc) { static void test_skillpotion(CuTest *tc) { unit *u; const struct item_type *itype; + skill* pSkill = NULL; + int initialWeeks_Entertainment = 0; + int initialWeeks_Stamina = 0; + int initialWeeks_Magic = 0; test_cleanup(); test_create_world(); u = test_create_unit(test_create_faction(NULL), findregion(0, 0)); itype = test_create_itemtype("skillpotion"); change_resource(u, itype->rtype, 2); + + learn_skill(u, SK_ENTERTAINMENT, 1.0); + pSkill = unit_skill(u, SK_ENTERTAINMENT); + sk_set(pSkill, 5); + initialWeeks_Entertainment = pSkill->weeks; + + learn_skill(u, SK_STAMINA, 1.0); + pSkill = unit_skill(u, SK_STAMINA); + sk_set(pSkill, 5); + initialWeeks_Stamina = pSkill->weeks; + + learn_skill(u, SK_MAGIC, 1.0); + pSkill = unit_skill(u, SK_MAGIC); + sk_set(pSkill, 5); + initialWeeks_Magic = pSkill->weeks; + CuAssertIntEquals(tc, 1, use_skillpotion(u, itype, 1, NULL)); + + pSkill = unit_skill(u, SK_ENTERTAINMENT); + CuAssertIntEquals(tc, initialWeeks_Entertainment - 3, pSkill->weeks); + + pSkill = unit_skill(u, SK_STAMINA); + CuAssertIntEquals(tc, initialWeeks_Stamina - 3, pSkill->weeks); + + pSkill = unit_skill(u, SK_MAGIC); + CuAssertIntEquals(tc, initialWeeks_Magic - 3, pSkill->weeks); + test_cleanup(); } From 91155f509cdab185b94216faeb6d8f2269239597 Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Sun, 1 Nov 2015 17:38:12 +0100 Subject: [PATCH 2/2] formatting: tabs --> spaces --- src/items/xerewards.test.c | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/items/xerewards.test.c b/src/items/xerewards.test.c index 1fffaf2d1..52a4d0ed0 100644 --- a/src/items/xerewards.test.c +++ b/src/items/xerewards.test.c @@ -19,10 +19,10 @@ static void test_manacrystal(CuTest *tc) { static void test_skillpotion(CuTest *tc) { unit *u; const struct item_type *itype; - skill* pSkill = NULL; - int initialWeeks_Entertainment = 0; - int initialWeeks_Stamina = 0; - int initialWeeks_Magic = 0; + skill* pSkill = NULL; + int initialWeeks_Entertainment = 0; + int initialWeeks_Stamina = 0; + int initialWeeks_Magic = 0; test_cleanup(); test_create_world(); @@ -30,31 +30,31 @@ static void test_skillpotion(CuTest *tc) { itype = test_create_itemtype("skillpotion"); change_resource(u, itype->rtype, 2); - learn_skill(u, SK_ENTERTAINMENT, 1.0); - pSkill = unit_skill(u, SK_ENTERTAINMENT); - sk_set(pSkill, 5); - initialWeeks_Entertainment = pSkill->weeks; + learn_skill(u, SK_ENTERTAINMENT, 1.0); + pSkill = unit_skill(u, SK_ENTERTAINMENT); + sk_set(pSkill, 5); + initialWeeks_Entertainment = pSkill->weeks; - learn_skill(u, SK_STAMINA, 1.0); - pSkill = unit_skill(u, SK_STAMINA); - sk_set(pSkill, 5); - initialWeeks_Stamina = pSkill->weeks; + learn_skill(u, SK_STAMINA, 1.0); + pSkill = unit_skill(u, SK_STAMINA); + sk_set(pSkill, 5); + initialWeeks_Stamina = pSkill->weeks; - learn_skill(u, SK_MAGIC, 1.0); - pSkill = unit_skill(u, SK_MAGIC); - sk_set(pSkill, 5); - initialWeeks_Magic = pSkill->weeks; + learn_skill(u, SK_MAGIC, 1.0); + pSkill = unit_skill(u, SK_MAGIC); + sk_set(pSkill, 5); + initialWeeks_Magic = pSkill->weeks; CuAssertIntEquals(tc, 1, use_skillpotion(u, itype, 1, NULL)); - pSkill = unit_skill(u, SK_ENTERTAINMENT); - CuAssertIntEquals(tc, initialWeeks_Entertainment - 3, pSkill->weeks); + pSkill = unit_skill(u, SK_ENTERTAINMENT); + CuAssertIntEquals(tc, initialWeeks_Entertainment - 3, pSkill->weeks); - pSkill = unit_skill(u, SK_STAMINA); - CuAssertIntEquals(tc, initialWeeks_Stamina - 3, pSkill->weeks); + pSkill = unit_skill(u, SK_STAMINA); + CuAssertIntEquals(tc, initialWeeks_Stamina - 3, pSkill->weeks); - pSkill = unit_skill(u, SK_MAGIC); - CuAssertIntEquals(tc, initialWeeks_Magic - 3, pSkill->weeks); + pSkill = unit_skill(u, SK_MAGIC); + CuAssertIntEquals(tc, initialWeeks_Magic - 3, pSkill->weeks); test_cleanup(); }