games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Merge pull request #4463 from SoundSSGood/IMarket-refactoring

Browse Source 
IMarket refactoring
This commit is contained in:
Ivan Savenko
2024-08-26 22:48:23 +03:00
committed by GitHub
parent 7b746bcaec 4035ab1550
commit 11e8b04ac5
63 changed files with 388 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spells/effects/CatapultTest.cpp
+3 -3
View File
@@ -64,7 +64,7 @@ TEST_F(CatapultTest, NotApplicableInVillage)
TEST_F(CatapultTest, NotApplicableForDefenderIfSmart)
{
auto fakeTown = std::make_shared<CGTownInstance>(nullptr);
fakeTown->builtBuildings.insert(BuildingID::FORT);
fakeTown->addBuilding(BuildingID::FORT);
mechanicsMock.casterSide = BattleSide::DEFENDER;
EXPECT_CALL(*battleFake, getDefendedTown()).WillRepeatedly(Return(fakeTown.get()));
@@ -78,7 +78,7 @@ TEST_F(CatapultTest, NotApplicableForDefenderIfSmart)
TEST_F(CatapultTest, DISABLED_ApplicableInTown)
{
auto fakeTown = std::make_shared<CGTownInstance>(nullptr);
fakeTown->builtBuildings.insert(BuildingID::FORT);
fakeTown->addBuilding(BuildingID::FORT);
EXPECT_CALL(*battleFake, getDefendedTown()).WillRepeatedly(Return(fakeTown.get()));
EXPECT_CALL(mechanicsMock, adaptProblem(_, _)).Times(0);
@@ -108,7 +108,7 @@ protected:
{
EffectFixture::setUp();
fakeTown = std::make_shared<CGTownInstance>(nullptr);
fakeTown->builtBuildings.insert(BuildingID::FORT);
fakeTown->addBuilding(BuildingID::FORT);
}
private:
std::shared_ptr<CGTownInstance> fakeTown;