games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

vcmi: fix unit tests for latest develop

Browse Source
This commit is contained in:
Konstantin
2023-03-13 17:41:07 +03:00
committed by Konstantin P
parent 65eed5339f
commit 924b456b0f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/mock/mock_IGameCallback.h
View File

@@ -82,7 +82,7 @@ public:
void setMovePoints(SetMovePoints * smp) override {} void setMovePoints(SetMovePoints * smp) override {}
void setManaPoints(ObjectInstanceID hid, int val) override {} void setManaPoints(ObjectInstanceID hid, int val) override {}
void giveHero(ObjectInstanceID id, PlayerColor player) override {} void giveHero(ObjectInstanceID id, PlayerColor player) override {}
void changeObjPos(ObjectInstanceID objid, int3 newPos, ui8 flags) override {} void changeObjPos(ObjectInstanceID objid, int3 newPos) override {}
void heroExchange(ObjectInstanceID hero1, ObjectInstanceID hero2) override {} //when two heroes meet on adventure map void heroExchange(ObjectInstanceID hero1, ObjectInstanceID hero2) override {} //when two heroes meet on adventure map
void changeFogOfWar(int3 center, ui32 radius, PlayerColor player, bool hide) override {} void changeFogOfWar(int3 center, ui32 radius, PlayerColor player, bool hide) override {}
void changeFogOfWar(std::unordered_set<int3, ShashInt3> &tiles, PlayerColor player, bool hide) override {} void changeFogOfWar(std::unordered_set<int3, ShashInt3> &tiles, PlayerColor player, bool hide) override {}

4
test/mock/mock_MapService.cpp
View File

@@ -65,12 +65,12 @@ std::unique_ptr<CMapHeader> MapServiceMock::loadMapHeader(const ResourceID & nam
return initialLoader.loadMapHeader(); return initialLoader.loadMapHeader();
} }
std::unique_ptr<CMap> MapServiceMock::loadMap(const ui8 * buffer, int size, const std::string & name) const std::unique_ptr<CMap> MapServiceMock::loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const
{ {
return loadMap(); return loadMap();
} }
std::unique_ptr<CMapHeader> MapServiceMock::loadMapHeader(const ui8 * buffer, int size, const std::string & name) const std::unique_ptr<CMapHeader> MapServiceMock::loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const
{ {
initialBuffer.seek(0); initialBuffer.seek(0);
CMapLoaderJson initialLoader(&initialBuffer); CMapLoaderJson initialLoader(&initialBuffer);

4
test/mock/mock_MapService.h
View File

@@ -31,8 +31,8 @@ public:
std::unique_ptr<CMap> loadMap(const ResourceID & name) const override; std::unique_ptr<CMap> loadMap(const ResourceID & name) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ResourceID & name) const override; std::unique_ptr<CMapHeader> loadMapHeader(const ResourceID & name) const override;
std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name) const override; std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ui8 * buffer, int size, const std::string & name) const override; std::unique_ptr<CMapHeader> loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override;
void saveMap(const std::unique_ptr<CMap> & map, boost::filesystem::path fullPath) const override; void saveMap(const std::unique_ptr<CMap> & map, boost::filesystem::path fullPath) const override;

2
test/mock/mock_battle_Unit.h
View File

@@ -77,7 +77,7 @@ public:
MOCK_CONST_METHOD1(willMove, bool(int)); MOCK_CONST_METHOD1(willMove, bool(int));
MOCK_CONST_METHOD1(waited, bool(int)); MOCK_CONST_METHOD1(waited, bool(int));
MOCK_CONST_METHOD1(battleQueuePhase, int(int)); MOCK_CONST_METHOD1(battleQueuePhase, battle::BattlePhases::Type(int));
MOCK_CONST_METHOD0(acquire, std::shared_ptr<battle::Unit>()); MOCK_CONST_METHOD0(acquire, std::shared_ptr<battle::Unit>());
MOCK_CONST_METHOD0(acquireState, std::shared_ptr<battle::CUnitState>()); MOCK_CONST_METHOD0(acquireState, std::shared_ptr<battle::CUnitState>());