Renamed mocked file to represent change in inheritance

test/CMakeLists.txt

@@ -72,7 +72,7 @@ set(test_SRCS
  		spells/targetConditions/TargetConditionItemFixture.cpp
 		
 		mock/BattleFake.cpp
-		mock/mock_IGameCallback.cpp
+		mock/mock_IGameEventCallback.cpp
  		mock/mock_MapService.cpp
  		mock/mock_BonusBearer.cpp
 		mock/mock_CPSICallback.cpp
@@ -94,7 +94,7 @@ set(test_HEADERS
 
 		mock/BattleFake.h
 		mock/mock_BonusBearer.h
-		mock/mock_IGameCallback.h
+		mock/mock_IGameEventCallback.h
  		mock/mock_MapService.h
 		mock/mock_BonusBearer.h
 

test/game/CGameStateTest.cpp

@@ -11,7 +11,7 @@
 
 #include "mock/mock_Services.h"
 #include "mock/mock_MapService.h"
-#include "mock/mock_IGameCallback.h"
+#include "mock/mock_IGameEventCallback.h"
 #include "mock/mock_spells_Problem.h"
 
 #include "../../lib/VCMIDirs.h"
@@ -41,7 +41,7 @@ class CGameStateTest : public ::testing::Test, public SpellCastEnvironment, publ
 {
 public:
 	CGameStateTest()
-		: gameCallback(new GameCallbackMock(this)),
+		: gameEventCallback(new GameEventCallbackMock(this)),
 		mapService("test/MiniTest/", this),
 		map(nullptr)
 	{
@@ -207,13 +207,13 @@ public:
 		BattleStart bs;
 		bs.info = std::move(battle);
 		ASSERT_EQ(gameState->currentBattles.size(), 0);
-		gameCallback->sendAndApply(bs);
+		gameEventCallback->sendAndApply(bs);
 		ASSERT_EQ(gameState->currentBattles.size(), 1);
 	}
 
 	std::shared_ptr<CGameState> gameState;
 
-	std::shared_ptr<GameCallbackMock> gameCallback;
+	std::shared_ptr<GameEventCallbackMock> gameEventCallback;
 
 	MapServiceMock mapService;
 	ServicesMock services;
@@ -240,7 +240,7 @@ TEST_F(CGameStateTest, DISABLED_issue2765)
 		na.artHolder = defender->id;
 		na.artId = ArtifactID::BALLISTA;
 		na.pos = ArtifactPosition::MACH1;
-		gameCallback->sendAndApply(na);
+		gameEventCallback->sendAndApply(na);
 	}
 
 	startTestBattle(attacker, defender);
@@ -257,7 +257,7 @@ TEST_F(CGameStateTest, DISABLED_issue2765)
 		BattleUnitsChanged pack;
 		pack.changedStacks.emplace_back(info.id, UnitChanges::EOperation::ADD);
 		info.save(pack.changedStacks.back().data);
-		gameCallback->sendAndApply(pack);
+		gameEventCallback->sendAndApply(pack);
 	}
 
 	const CStack * att = nullptr;
@@ -331,7 +331,7 @@ TEST_F(CGameStateTest, DISABLED_battleResurrection)
 		na.artHolder = attacker->id;
 		na.artId = ArtifactID::SPELLBOOK;
 		na.pos = ArtifactPosition::SPELLBOOK;
-		gameCallback->sendAndApply(na);
+		gameEventCallback->sendAndApply(na);
 	}
 
 	startTestBattle(attacker, defender);
@@ -350,7 +350,7 @@ TEST_F(CGameStateTest, DISABLED_battleResurrection)
 		BattleUnitsChanged pack;
 		pack.changedStacks.emplace_back(info.id, UnitChanges::EOperation::ADD);
 		info.save(pack.changedStacks.back().data);
-		gameCallback->sendAndApply(pack);
+		gameEventCallback->sendAndApply(pack);
 	}
 
 	{
@@ -365,7 +365,7 @@ TEST_F(CGameStateTest, DISABLED_battleResurrection)
 		BattleUnitsChanged pack;
 		pack.changedStacks.emplace_back(info.id, UnitChanges::EOperation::ADD);
 		info.save(pack.changedStacks.back().data);
-		gameCallback->sendAndApply(pack);
+		gameEventCallback->sendAndApply(pack);
 	}
 
 	CStack * unit = gameState->currentBattles.front()->getStack(unitId);

test/mock/mock_IGameCallback.cpp

@@ -1,30 +0,0 @@
-/*
- * mock_IGameCallback.cpp, part of VCMI engine
- *
- * Authors: listed in file AUTHORS in main folder
- *
- * License: GNU General Public License v2.0 or later
- * Full text of license available in license.txt file, in main folder
- *
- */
-#include "StdInc.h"
-
-#include "mock_IGameCallback.h"
-
-GameCallbackMock::GameCallbackMock(UpperCallback * upperCallback_)
-	: upperCallback(upperCallback_)
-{
-
-}
-
-GameCallbackMock::~GameCallbackMock() = default;
-
-void GameCallbackMock::sendAndApply(CPackForClient & pack)
-{
-	upperCallback->apply(pack);
-}
-
-vstd::RNG & GameCallbackMock::getRandomGenerator()
-{
-	throw std::runtime_error("Not implemented!");
-}

test/mock/mock_IGameEventCallback.cpp

@@ -0,0 +1,30 @@
+/*
+ * mock_IGameEventCallback.cpp, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#include "StdInc.h"
+
+#include "mock_IGameEventCallback.h"
+
+GameEventCallbackMock::GameEventCallbackMock(UpperCallback * upperCallback_)
+	: upperCallback(upperCallback_)
+{
+
+}
+
+GameEventCallbackMock::~GameEventCallbackMock() = default;
+
+void GameEventCallbackMock::sendAndApply(CPackForClient & pack)
+{
+	upperCallback->apply(pack);
+}
+
+vstd::RNG & GameEventCallbackMock::getRandomGenerator()
+{
+	throw std::runtime_error("Not implemented!");
+}

test/mock/mock_IGameCallback.h → test/mock/mock_IGameEventCallback.h

@@ -1,5 +1,5 @@
 /*
- * mock_IGameCallback.h, part of VCMI engine
+ * mock_IGameEventCallback.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -12,18 +12,17 @@
 
 #include <vcmi/ServerCallback.h>
 
-#include "../../lib/callback/CGameInfoCallback.h"
 #include "../../lib/callback/IGameEventCallback.h"
 #include "../../lib/int3.h"
 #include "../../lib/ResourceSet.h"
 
-class GameCallbackMock : public IGameEventCallback
+class GameEventCallbackMock : public IGameEventCallback
 {
 public:
 	using UpperCallback = ::ServerCallback;
 
-	GameCallbackMock(UpperCallback * upperCallback_);
-	virtual ~GameCallbackMock();
+	GameEventCallbackMock(UpperCallback * upperCallback_);
+	virtual ~GameEventCallbackMock();
 
 	void setObjPropertyValue(ObjectInstanceID objid, ObjProperty prop, int32_t value = 0) override {}
 	void setObjPropertyID(ObjectInstanceID objid, ObjProperty prop, ObjPropertyID identifier) override {}
@@ -92,10 +91,6 @@ public:
 
 	vstd::RNG & getRandomGenerator() override;
 
-#if SCRIPTING_ENABLED
-	MOCK_CONST_METHOD0(getGlobalContextPool, scripting::Pool *());
-#endif
-
 private:
 	UpperCallback * upperCallback;
 };