games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Restore UnitStateMagicTest's

Browse Source
This commit is contained in:
Ivan Savenko
2025-08-04 12:49:35 +03:00
parent be2cb93201
commit d98b7b93e0
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/bonuses/IBonusBearer.cpp
View File

@@ -48,7 +48,7 @@ TConstBonusListPtr IBonusBearer::getBonusesOfType(BonusType type) const
TConstBonusListPtr IBonusBearer::getBonusesOfType(BonusType type, BonusSubtypeID subtype) const TConstBonusListPtr IBonusBearer::getBonusesOfType(BonusType type, BonusSubtypeID subtype) const
{ {
std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + subtype.toString(); std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + std::to_string(subtype.getNum());
CSelector s = Selector::typeSubtype(type, subtype); CSelector s = Selector::typeSubtype(type, subtype);
return getBonuses(s, cachingStr); return getBonuses(s, cachingStr);
} }
@@ -79,7 +79,7 @@ bool IBonusBearer::hasBonusOfType(BonusType type) const
int IBonusBearer::valOfBonuses(BonusType type, BonusSubtypeID subtype) const int IBonusBearer::valOfBonuses(BonusType type, BonusSubtypeID subtype) const
{ {
//This part is performance-critical //This part is performance-critical
std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + subtype.toString(); std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + std::to_string(subtype.getNum());
CSelector s = Selector::typeSubtype(type, subtype); CSelector s = Selector::typeSubtype(type, subtype);
@@ -89,7 +89,7 @@ int IBonusBearer::valOfBonuses(BonusType type, BonusSubtypeID subtype) const
bool IBonusBearer::hasBonusOfType(BonusType type, BonusSubtypeID subtype) const bool IBonusBearer::hasBonusOfType(BonusType type, BonusSubtypeID subtype) const
{ {
//This part is performance-critical //This part is performance-critical
std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + subtype.toString(); std::string cachingStr = "type_" + std::to_string(static_cast<int>(type)) + "_" + std::to_string(subtype.getNum());
CSelector s = Selector::typeSubtype(type, subtype); CSelector s = Selector::typeSubtype(type, subtype);

11
test/battle/CUnitStateMagicTest.cpp
View File

@@ -45,6 +45,7 @@ public:
EXPECT_CALL(infoMock, unitBaseAmount()).WillRepeatedly(Return(DEFAULT_AMOUNT)); EXPECT_CALL(infoMock, unitBaseAmount()).WillRepeatedly(Return(DEFAULT_AMOUNT));
EXPECT_CALL(spellMock, getId()).WillRepeatedly(Return(SpellID(DEFAULT_SPELL_INDEX)));
EXPECT_CALL(spellMock, getIndex()).WillRepeatedly(Return(DEFAULT_SPELL_INDEX)); EXPECT_CALL(spellMock, getIndex()).WillRepeatedly(Return(DEFAULT_SPELL_INDEX));
} }
@@ -74,7 +75,7 @@ TEST_F(UnitStateMagicTest, initialNormal)
EXPECT_EQ(subject.casts.available(), 567); EXPECT_EQ(subject.casts.available(), 567);
} }
TEST_F(UnitStateMagicTest, DISABLED_schoolLevelByDefault) TEST_F(UnitStateMagicTest, schoolLevelByDefault)
{ {
setDefaultExpectations(); setDefaultExpectations();
initUnit(); initUnit();
@@ -82,7 +83,7 @@ TEST_F(UnitStateMagicTest, DISABLED_schoolLevelByDefault)
EXPECT_EQ(subject.getSpellSchoolLevel(&spellMock, nullptr), 0); EXPECT_EQ(subject.getSpellSchoolLevel(&spellMock, nullptr), 0);
} }
TEST_F(UnitStateMagicTest, DISABLED_schoolLevelForNormalCaster) TEST_F(UnitStateMagicTest, schoolLevelForNormalCaster)
{ {
setDefaultExpectations(); setDefaultExpectations();
initUnit(); initUnit();
@@ -91,7 +92,7 @@ TEST_F(UnitStateMagicTest, DISABLED_schoolLevelForNormalCaster)
EXPECT_EQ(subject.getSpellSchoolLevel(&spellMock, nullptr), DEFAULT_SCHOOL_LEVEL); EXPECT_EQ(subject.getSpellSchoolLevel(&spellMock, nullptr), DEFAULT_SCHOOL_LEVEL);
} }
TEST_F(UnitStateMagicTest, DISABLED_effectLevelForNormalCaster) TEST_F(UnitStateMagicTest, effectLevelForNormalCaster)
{ {
setDefaultExpectations(); setDefaultExpectations();
initUnit(); initUnit();
@@ -155,7 +156,7 @@ TEST_F(UnitStateMagicTest, enchantPower)
EXPECT_EQ(subject.getEnchantPower(&spellMock), ENCHANT_POWER); EXPECT_EQ(subject.getEnchantPower(&spellMock), ENCHANT_POWER);
} }
TEST_F(UnitStateMagicTest, DISABLED_effectValueByDefault) TEST_F(UnitStateMagicTest, effectValueByDefault)
{ {
setDefaultExpectations(); setDefaultExpectations();
initUnit(); initUnit();
@@ -164,7 +165,7 @@ TEST_F(UnitStateMagicTest, DISABLED_effectValueByDefault)
EXPECT_EQ(subject.getEffectValue(&spellMock), 0); EXPECT_EQ(subject.getEffectValue(&spellMock), 0);
} }
TEST_F(UnitStateMagicTest, DISABLED_effectValue) TEST_F(UnitStateMagicTest, effectValue)
{ {
setDefaultExpectations(); setDefaultExpectations();
initUnit(); initUnit();