games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Fix tests + scripting compilation on gcc

Browse Source
This commit is contained in:
Dydzio
2023-01-04 21:33:56 +01:00
committed by Ivan Savenko
parent 1700a598f6
commit a2ce9220ed
15 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ScriptHandler.cpp
View File

@@ -17,6 +17,7 @@
#include "CGameInterface.h"
#include "CScriptingModule.h"
#include "CModHandler.h"
#include "VCMIDirs.h"
#include "serializer/JsonDeserializer.h"

1
scripting/lua/LuaScriptingContext.cpp
View File

@@ -24,6 +24,7 @@
#include "../../lib/filesystem/Filesystem.h"
#include "../../lib/battle/IBattleInfoCallback.h"
#include "../../lib/CGameInfoCallback.h"
#include "../../lib/CModHandler.h"
VCMI_LIB_NAMESPACE_BEGIN

8
test/entity/CArtifactTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CArtifactTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CArtifact> subject;
@@ -36,10 +36,10 @@ TEST_F(CArtifactTest, RegistersIcons)
subject->image = "Test1";
subject->large = "Test2";
auto cb = std::bind(&CArtifactTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CArtifactTest::registarCb, this, _1, _2, _3, _4);
EXPECT_CALL(*this, registarCb(Eq(4242), "ARTIFACT", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), "ARTIFACTLARGE", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "ARTIFACT", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "ARTIFACTLARGE", "Test2"));
subject->registerIcons(cb);
}

8
test/entity/CCreatureTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CCreatureTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CCreature> subject;
@@ -35,10 +35,10 @@ TEST_F(CCreatureTest, RegistersIcons)
subject->smallIconName = "Test1";
subject->largeIconName = "Test2";
auto cb = std::bind(&CCreatureTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CCreatureTest::registarCb, this, _1, _2, _3, _4);
EXPECT_CALL(*this, registarCb(Eq(4242), "CPRSMALL", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), "TWCRPORT", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "CPRSMALL", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "TWCRPORT", "Test2"));
subject->registerIcons(cb);
}

22
test/entity/CFactionTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CFactionTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CFaction> subject;
@@ -41,13 +41,13 @@ TEST_F(CFactionTest, HasTown)
TEST_F(CFactionTest, RegistersNoIconsIfNoTown)
{
auto cb = std::bind(&CFactionTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CFactionTest::registarCb, this, _1, _2, _3, _4);
subject->registerIcons(cb);
}
TEST_F(CFactionTest, RegistersIcons)
{
auto cb = std::bind(&CFactionTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CFactionTest::registarCb, this, _1, _2, _3, _4);
subject->town = new CTown();
@@ -69,15 +69,15 @@ TEST_F(CFactionTest, RegistersIcons)
info.iconSmall[1][1] = "Test40";
EXPECT_CALL(*this, registarCb(Eq(10), "ITPT", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(11), "ITPT", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(12), "ITPT", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(13), "ITPT", "Test4"));
EXPECT_CALL(*this, registarCb(Eq(10), Eq(0), "ITPT", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(11), Eq(0), "ITPT", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(12), Eq(0), "ITPT", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(13), Eq(0), "ITPT", "Test4"));
EXPECT_CALL(*this, registarCb(Eq(12), "ITPA", "Test10"));
EXPECT_CALL(*this, registarCb(Eq(13), "ITPA", "Test20"));
EXPECT_CALL(*this, registarCb(Eq(14), "ITPA", "Test30"));
EXPECT_CALL(*this, registarCb(Eq(15), "ITPA", "Test40"));
EXPECT_CALL(*this, registarCb(Eq(12), Eq(0), "ITPA", "Test10"));
EXPECT_CALL(*this, registarCb(Eq(13), Eq(0), "ITPA", "Test20"));
EXPECT_CALL(*this, registarCb(Eq(14), Eq(0), "ITPA", "Test30"));
EXPECT_CALL(*this, registarCb(Eq(15), Eq(0), "ITPA", "Test40"));
subject->registerIcons(cb);
}

4
test/entity/CHeroClassTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CHeroClassTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CHeroClass> subject;
@@ -32,7 +32,7 @@ protected:
TEST_F(CHeroClassTest, RegistersIconsDoesNothing)
{
auto cb = std::bind(&CHeroClassTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CHeroClassTest::registarCb, this, _1, _2, _3, _4);
subject->registerIcons(cb);
}

12
test/entity/CHeroTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CHeroTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CHero> subject;
@@ -39,12 +39,12 @@ TEST_F(CHeroTest, RegistersIcons)
subject->portraitSmall = "Test3";
subject->portraitLarge = "Test4";
auto cb = std::bind(&CHeroTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CHeroTest::registarCb, this, _1, _2, _3, _4);
EXPECT_CALL(*this, registarCb(Eq(4242), "UN32", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), "UN44", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(4242), "PORTRAITSSMALL", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(4242), "PORTRAITSLARGE", "Test4"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "UN32", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "UN44", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "PORTRAITSSMALL", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(4242), Eq(0), "PORTRAITSLARGE", "Test4"));
subject->registerIcons(cb);
}

10
test/entity/CSkillTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CSkillTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
protected:
std::shared_ptr<CSkill> subject;
@@ -41,15 +41,15 @@ TEST_F(CSkillTest, RegistersIcons)
skillAtLevel.iconLarge = "TestL"+std::to_string(level);
}
auto cb = std::bind(&CSkillTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CSkillTest::registarCb, this, _1, _2, _3, _4);
for(int level = 1; level <= 3; level++)
{
int frame = 2 + level + 3 * 42;
EXPECT_CALL(*this, registarCb(Eq(frame), "SECSK32", "TestS"+std::to_string(level)));
EXPECT_CALL(*this, registarCb(Eq(frame), "SECSKILL", "TestM"+std::to_string(level)));
EXPECT_CALL(*this, registarCb(Eq(frame), "SECSK82", "TestL"+std::to_string(level)));
EXPECT_CALL(*this, registarCb(Eq(frame), Eq(0), "SECSK32", "TestS"+std::to_string(level)));
EXPECT_CALL(*this, registarCb(Eq(frame), Eq(0), "SECSKILL", "TestM"+std::to_string(level)));
EXPECT_CALL(*this, registarCb(Eq(frame), Eq(0), "SECSK82", "TestL"+std::to_string(level)));
}
subject->registerIcons(cb);

1
test/erm/ERM_BU.cpp
View File

@@ -245,7 +245,6 @@ TEST_F(ERM_BU_S, Summon)
auto checkApply = [&](BattleUnitsChanged * pack)
{
EXPECT_TRUE(pack->customEffects.empty());
EXPECT_EQ(pack->changedStacks.size(), 1);
if(!pack->changedStacks.empty())

2
test/events/EventBusTest.cpp
View File

@@ -28,7 +28,7 @@ public:
public:
static SubscriptionRegistry<EventExample> * getRegistry()
{
static std::unique_ptr<SubscriptionRegistry<EventExample>> Instance = make_unique<SubscriptionRegistry<EventExample>>();
static std::unique_ptr<SubscriptionRegistry<EventExample>> Instance = std::make_unique<SubscriptionRegistry<EventExample>>();
return Instance.get();
}

2
test/map/CMapEditManagerTest.cpp
View File

@@ -24,7 +24,7 @@ TEST(MapManager, DrawTerrain_Type)
{
try
{
auto map = make_unique<CMap>();
auto map = std::make_unique<CMap>();
map->width = 52;
map->height = 52;
map->initTerrain();

1
test/mock/mock_battle_Unit.h
View File

@@ -49,6 +49,7 @@ public:
MOCK_CONST_METHOD0(ableToRetaliate, bool());
MOCK_CONST_METHOD0(alive, bool());
MOCK_CONST_METHOD0(isGhost, bool());
MOCK_CONST_METHOD0(isFrozen, bool());
MOCK_CONST_METHOD1(isValidTarget, bool(bool));
MOCK_CONST_METHOD0(isClone, bool());

1
test/scripting/ScriptFixture.cpp
View File

@@ -8,6 +8,7 @@
*
*/
#include "StdInc.h"
#include "lib/CModHandler.h"
#include "ScriptFixture.h"

12
test/spells/CSpellTest.cpp
View File

@@ -19,7 +19,7 @@ using namespace ::testing;
class CSpellTest : public Test
{
public:
MOCK_METHOD3(registarCb, void(int32_t, const std::string &, const std::string &));
MOCK_METHOD4(registarCb, void(int32_t, int32_t, const std::string &, const std::string &));
std::shared_ptr<CSpell> subject;
protected:
void SetUp() override
@@ -36,12 +36,12 @@ TEST_F(CSpellTest, RegistersIcons)
{
subject->id = SpellID(42);
auto cb = std::bind(&CSpellTest::registarCb, this, _1, _2, _3);
auto cb = std::bind(&CSpellTest::registarCb, this, _1, _2, _3, _4);
EXPECT_CALL(*this, registarCb(Eq(42), "SPELLS", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(43), "SPELLINT", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(42), "SPELLBON", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(42), "SPELLSCR", "Test4"));
EXPECT_CALL(*this, registarCb(Eq(42), Eq(0), "SPELLS", "Test1"));
EXPECT_CALL(*this, registarCb(Eq(43), Eq(0), "SPELLINT", "Test2"));
EXPECT_CALL(*this, registarCb(Eq(42), Eq(0), "SPELLBON", "Test3"));
EXPECT_CALL(*this, registarCb(Eq(42), Eq(0), "SPELLSCR", "Test4"));
subject->registerIcons(cb);
}

1
test/spells/effects/TimedTest.cpp
View File

@@ -12,6 +12,7 @@
#include "EffectFixture.h"
#include <vstd/RNG.h>
#include "lib/CModHandler.h"
namespace test
{