Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-17 21:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main into property-entrance-rewrite

Browse Source
This commit is contained in:
Jettford
2023-10-28 01:09:03 +01:00
parent 758bf8becf
commit 6df16ab406
220 changed files with 1451 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/dCommonTests/AMFDeserializeTests.cpp
View File

@@ -6,7 +6,7 @@
#include "Amf3.h"
#include "Game.h"
#include "dLogger.h"
#include "Logger.h"
/**
* Helper method that all tests use to get their respective AMF.

4
tests/dCommonTests/TestLDFFormat.cpp
View File

@@ -4,7 +4,7 @@
#include "Game.h"
#include "dCommonDependencies.h"
#include "dLogger.h"
#include "Logger.h"
class LDFTests : public dCommonDependenciesTest {
protected:
@@ -237,7 +237,7 @@ TEST_F(LDFTests, LDFParseEdgeCaseTest) {
"key=Garbage:value", // invalid LDF type
};
for (auto testString : tests) {
Game::logger->Log("LDFTests", "Testing LDF Parsing of invalid string (%s)", testString.c_str());
LOG("Testing LDF Parsing of invalid string (%s)", testString.c_str());
EXPECT_NO_THROW(LDFBaseData::DataFromString(testString));
}
}

4
tests/dCommonTests/dCommonDependencies.cpp
View File

@@ -1,7 +1,7 @@
#include "Game.h"
class dLogger;
class Logger;
namespace Game
{
dLogger* logger;
Logger* logger;
} // namespace Game

4
tests/dCommonTests/dCommonDependencies.h
View File

@@ -2,7 +2,7 @@
#define __DCOMMONDEPENDENCIES__H__
#include "Game.h"
#include "dLogger.h"
#include "Logger.h"
#include "dServer.h"
#include "EntityInfo.h"
#include "EntityManager.h"
@@ -12,7 +12,7 @@
class dCommonDependenciesTest : public ::testing::Test {
protected:
void SetUpDependencies() {
Game::logger = new dLogger("./testing.log", true, true);
Game::logger = new Logger("./testing.log", true, true);
}
void TearDownDependencies() {