From de56d8cf324cc6b50785981452b6648de068b6dd Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 4 Aug 2025 13:10:58 +0300 Subject: [PATCH] Enable spell condition tests --- test/spells/targetConditions/AbsoluteSpellConditionTest.cpp | 5 +++-- test/spells/targetConditions/NormalSpellConditionTest.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/spells/targetConditions/AbsoluteSpellConditionTest.cpp b/test/spells/targetConditions/AbsoluteSpellConditionTest.cpp index 010a2f1c6..b7f2f399a 100644 --- a/test/spells/targetConditions/AbsoluteSpellConditionTest.cpp +++ b/test/spells/targetConditions/AbsoluteSpellConditionTest.cpp @@ -27,6 +27,7 @@ public: EXPECT_CALL(unitMock, getAllBonuses(_, _)).Times(AtLeast(1)); EXPECT_CALL(unitMock, getTreeVersion()).Times(AtLeast(0)); EXPECT_CALL(mechanicsMock, getSpellIndex()).WillRepeatedly(Return(castSpell)); + EXPECT_CALL(mechanicsMock, getSpellId()).WillRepeatedly(Return(SpellID(castSpell))); } void SetUp() override @@ -40,7 +41,7 @@ public: } }; -TEST_P(AbsoluteSpellConditionTest, DISABLED_ChecksAbsoluteCase) +TEST_P(AbsoluteSpellConditionTest, ChecksAbsoluteCase) { setDefaultExpectations(); auto bonus = std::make_shared(BonusDuration::ONE_BATTLE, BonusType::SPELL_IMMUNITY, BonusSource::OTHER, 4, BonusSourceID(), BonusSubtypeID(SpellID(immuneSpell))); @@ -54,7 +55,7 @@ TEST_P(AbsoluteSpellConditionTest, DISABLED_ChecksAbsoluteCase) EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock)); } -TEST_P(AbsoluteSpellConditionTest, DISABLED_IgnoresNormalCase) +TEST_P(AbsoluteSpellConditionTest, IgnoresNormalCase) { setDefaultExpectations(); auto bonus = std::make_shared(BonusDuration::ONE_BATTLE, BonusType::SPELL_IMMUNITY, BonusSource::OTHER, 4, BonusSourceID(), BonusSubtypeID(SpellID(immuneSpell))); diff --git a/test/spells/targetConditions/NormalSpellConditionTest.cpp b/test/spells/targetConditions/NormalSpellConditionTest.cpp index 2bbda882b..daf9a8041 100644 --- a/test/spells/targetConditions/NormalSpellConditionTest.cpp +++ b/test/spells/targetConditions/NormalSpellConditionTest.cpp @@ -27,6 +27,7 @@ public: EXPECT_CALL(unitMock, getAllBonuses(_, _)).Times(AtLeast(1)); EXPECT_CALL(unitMock, getTreeVersion()).Times(AtLeast(0)); EXPECT_CALL(mechanicsMock, getSpellIndex()).WillRepeatedly(Return(castSpell)); + EXPECT_CALL(mechanicsMock, getSpellId()).WillRepeatedly(Return(SpellID(castSpell))); } void SetUp() override @@ -40,7 +41,7 @@ public: } }; -TEST_P(NormalSpellConditionTest, DISABLED_ChecksAbsoluteCase) +TEST_P(NormalSpellConditionTest, ChecksAbsoluteCase) { setDefaultExpectations(); auto bonus = std::make_shared(BonusDuration::ONE_BATTLE, BonusType::SPELL_IMMUNITY, BonusSource::OTHER, 4, BonusSourceID(), BonusSubtypeID(SpellID(immuneSpell))); @@ -54,7 +55,7 @@ TEST_P(NormalSpellConditionTest, DISABLED_ChecksAbsoluteCase) EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock)); } -TEST_P(NormalSpellConditionTest, DISABLED_ChecksNormalCase) +TEST_P(NormalSpellConditionTest, ChecksNormalCase) { setDefaultExpectations(); auto bonus = std::make_shared(BonusDuration::ONE_BATTLE, BonusType::SPELL_IMMUNITY, BonusSource::OTHER, 4, BonusSourceID(), BonusSubtypeID(SpellID(immuneSpell)));