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

Fix failing tests - regression from some time ago?

Browse Source
This commit is contained in:
Ivan Savenko
2025-08-04 12:24:20 +03:00
parent 1d2d189e4a
commit 5e7724bf9a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/entity/CArtifactTest.cpp
View File

@@ -40,7 +40,6 @@ TEST_F(CArtifactTest, RegistersIcons)
}; };
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "ARTIFACT", "Test1")); EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "ARTIFACT", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "ARTIFACTLARGE", "Test2"));
subject->registerIcons(cb); subject->registerIcons(cb);
} }

6
test/map/CMapEditManagerTest.cpp
View File

@@ -18,6 +18,7 @@
#include "../lib/int3.h" #include "../lib/int3.h"
#include "../lib/CRandomGenerator.h" #include "../lib/CRandomGenerator.h"
#include "../lib/GameLibrary.h" #include "../lib/GameLibrary.h"
#include "../lib/callback/EditorCallback.h"
TEST(MapManager, DrawTerrain_Type) TEST(MapManager, DrawTerrain_Type)
@@ -114,8 +115,9 @@ TEST(MapManager, DrawTerrain_View)
const ResourcePath testMap("test/TerrainViewTest", EResType::MAP); const ResourcePath testMap("test/TerrainViewTest", EResType::MAP);
// Load maps and json config // Load maps and json config
CMapService mapService; CMapService mapService;
const auto originalMap = mapService.loadMap(testMap, nullptr); EditorCallback cb(nullptr);
auto map = mapService.loadMap(testMap, nullptr); const auto originalMap = mapService.loadMap(testMap, &cb);
auto map = mapService.loadMap(testMap, &cb);
// Validate edit manager // Validate edit manager
auto editManager = map->getEditManager(); auto editManager = map->getEditManager();

6
test/spells/targetConditions/BonusConditionTest.cpp
View File

@@ -28,7 +28,7 @@ public:
void SetUp() override void SetUp() override
{ {
TargetConditionItemTest::SetUp(); TargetConditionItemTest::SetUp();
subject = TargetConditionItemFactory::getDefault()->createConfigurable("", "bonus", "DIRECT_DAMAGE_IMMUNITY"); subject = TargetConditionItemFactory::getDefault()->createConfigurable("game", "bonus", "UNDEAD");
GTEST_ASSERT_NE(subject, nullptr); GTEST_ASSERT_NE(subject, nullptr);
} }
}; };
@@ -39,10 +39,10 @@ TEST_F(BonusConditionTest, ImmuneByDefault)
EXPECT_FALSE(subject->isReceptive(&mechanicsMock, &unitMock)); EXPECT_FALSE(subject->isReceptive(&mechanicsMock, &unitMock));
} }
TEST_F(BonusConditionTest, DISABLED_ReceptiveIfMatchesType) TEST_F(BonusConditionTest, ReceptiveIfMatchesType)
{ {
setDefaultExpectations(); setDefaultExpectations();
unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::SPELL_DAMAGE_REDUCTION, BonusSource::OTHER, 100, BonusSourceID())); unitBonuses.addNewBonus(std::make_shared<Bonus>(BonusDuration::ONE_BATTLE, BonusType::UNDEAD, BonusSource::OTHER, 0, BonusSourceID()));
EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock)); EXPECT_TRUE(subject->isReceptive(&mechanicsMock, &unitMock));
} }