tests: test nonMagical effects

test/spells/targetConditions/ImmunityNegationConditionTest.cpp

@@ -20,16 +20,19 @@ namespace test
 using namespace ::spells;
 using namespace ::testing;
 
-class ImmunityNegationConditionTest : public TargetConditionItemTest, public WithParamInterface<bool>
+class ImmunityNegationConditionTest : public TargetConditionItemTest, public WithParamInterface<std::tuple<bool, bool>>
 {
 public:
 	bool ownerMatches;
+	bool isMagicalEffect;
 
 	void setDefaultExpectations()
 	{
-		ownerMatches = GetParam();
+		ownerMatches = ::testing::get<0>(GetParam());
+		isMagicalEffect = ::testing::get<1>(GetParam());
 		EXPECT_CALL(unitMock, getAllBonuses(_, _, _, _)).Times(AtLeast(0));
 		EXPECT_CALL(unitMock, getTreeVersion()).Times(AtLeast(0));
+		EXPECT_CALL(mechanicsMock, isMagicalEffect()).Times(AtLeast(0)).WillRepeatedly(Return(isMagicalEffect));
 		EXPECT_CALL(mechanicsMock, ownerMatches(Eq(&unitMock), Field(&boost::logic::tribool::value, boost::logic::tribool::false_value))).WillRepeatedly(Return(ownerMatches));
 	}
 
@@ -56,7 +59,7 @@ TEST_P(ImmunityNegationConditionTest, WithHeroNegation)
 
 	unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::NEGATE_ALL_NATURAL_IMMUNITIES, BonusSource::OTHER, 0, 0, 1));
 
-	EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
+	EXPECT_EQ(isMagicalEffect, subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
 TEST_P(ImmunityNegationConditionTest, WithBattleWideNegation)
@@ -66,14 +69,18 @@ TEST_P(ImmunityNegationConditionTest, WithBattleWideNegation)
 	unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::NEGATE_ALL_NATURAL_IMMUNITIES, BonusSource::OTHER, 0, 0, 0));
 
 	//This should return if ownerMatches, because anyone should cast onto owner's stacks, but not on enemyStacks
-	EXPECT_EQ(ownerMatches, subject->isReceptive(&mechanicsMock, &unitMock));
+	EXPECT_EQ(ownerMatches && isMagicalEffect, subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
 INSTANTIATE_TEST_SUITE_P
 (
 	ByUnitOwner,
 	ImmunityNegationConditionTest,
-	Values(false, true)
+	Combine
+	(
+		Values(false, true),
+		Values(false, true)
+	)
 );
 
 }

test/spells/targetConditions/NormalLevelConditionTest.cpp

@@ -17,14 +17,17 @@ using namespace ::spells;
 using namespace ::testing;
 
 
-class NormalLevelConditionTest : public TargetConditionItemTest
+class NormalLevelConditionTest : public TargetConditionItemTest, public WithParamInterface<bool>
 {
 public:
+	bool isMagicalEffect;
 
 	void setDefaultExpectations()
 	{
-		EXPECT_CALL(mechanicsMock, isMagicalEffect()).WillRepeatedly(Return(true));
-		EXPECT_CALL(unitMock, getAllBonuses(_, _, _, _)).Times(AtLeast(1));
+		isMagicalEffect = GetParam();
+		EXPECT_CALL(mechanicsMock, isMagicalEffect()).WillRepeatedly(Return(isMagicalEffect));
+		if(isMagicalEffect)
+			EXPECT_CALL(unitMock, getAllBonuses(_, _, _, _)).Times(AtLeast(1));
 		EXPECT_CALL(unitMock, getTreeVersion()).Times(AtLeast(0));
 	}
 
@@ -36,43 +39,53 @@ public:
 	}
 };
 
-TEST_F(NormalLevelConditionTest, DefaultForAbility)
+TEST_P(NormalLevelConditionTest, DefaultForAbility)
 {
 	setDefaultExpectations();
 	EXPECT_CALL(mechanicsMock, getSpellLevel()).WillRepeatedly(Return(0));
 	EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
-TEST_F(NormalLevelConditionTest, DefaultForNormal)
+TEST_P(NormalLevelConditionTest, DefaultForNormal)
 {
 	setDefaultExpectations();
 	EXPECT_CALL(mechanicsMock, getSpellLevel()).WillRepeatedly(Return(1));
 	EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
-TEST_F(NormalLevelConditionTest, ReceptiveNormal)
+TEST_P(NormalLevelConditionTest, ReceptiveNormal)
 {
 	setDefaultExpectations();
 	unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::LEVEL_SPELL_IMMUNITY, BonusSource::OTHER, 3, 0));
-	EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(4));
+	if(isMagicalEffect)
+		EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(4));
 	EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
 //TODO: this tests covers fact that creature abilities ignored (by spell level == 0), should this be done by ability flag or by cast mode?
-TEST_F(NormalLevelConditionTest, ReceptiveAbility)
+TEST_P(NormalLevelConditionTest, ReceptiveAbility)
 {
 	setDefaultExpectations();
 	unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::LEVEL_SPELL_IMMUNITY, BonusSource::OTHER, 5, 0));
-	EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(0));
+	if(isMagicalEffect)
+		EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(0));
 	EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
-TEST_F(NormalLevelConditionTest, ImmuneNormal)
+TEST_P(NormalLevelConditionTest, ImmuneNormal)
 {
 	setDefaultExpectations();
 	unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::LEVEL_SPELL_IMMUNITY, BonusSource::OTHER, 4, 0));
-	EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(2));
-	EXPECT_FALSE(subject->isReceptive(&mechanicsMock, &unitMock));
+	if(isMagicalEffect)
+		EXPECT_CALL(mechanicsMock, getSpellLevel()).Times(AtLeast(1)).WillRepeatedly(Return(2));
+	EXPECT_EQ(!isMagicalEffect, subject->isReceptive(&mechanicsMock, &unitMock));
 }
 
+INSTANTIATE_TEST_SUITE_P
+(
+	ByMagicalEffect,
+	NormalLevelConditionTest,
+	Values(false, true)
+);
+
 }