flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

SelfTests: Removed the unneeded cSelfTests class.

Browse Source
This commit is contained in:
Mattes D 2016-06-10 20:18:49 +02:00
parent aa4b3ebf2f
commit 36eefbf0f2
8 changed files with 0 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -63,7 +63,6 @@ SET (SRCS
RCONServer.cpp RCONServer.cpp
Root.cpp Root.cpp
Scoreboard.cpp Scoreboard.cpp
SelfTests.cpp
Server.cpp Server.cpp
SetChunkData.cpp SetChunkData.cpp
SpawnPrepare.cpp SpawnPrepare.cpp
@ -140,7 +139,6 @@ SET (HDRS
RCONServer.h RCONServer.h
Root.h Root.h
Scoreboard.h Scoreboard.h
SelfTests.h
Server.h Server.h
SetChunkData.h SetChunkData.h
SettingsRepositoryInterface.h SettingsRepositoryInterface.h

1
src/Generating/PieceGenerator.cpp
View File

@ -6,7 +6,6 @@
#include "Globals.h" #include "Globals.h"
#include "PieceGenerator.h" #include "PieceGenerator.h"
#include "../SelfTests.h"
#include "VerticalStrategy.h" #include "VerticalStrategy.h"
#include "VerticalLimit.h" #include "VerticalLimit.h"

1
src/Generating/PrefabPiecePool.cpp
View File

@ -6,7 +6,6 @@
#include "Globals.h" #include "Globals.h"
#include "PrefabPiecePool.h" #include "PrefabPiecePool.h"
#include "../Bindings/LuaState.h" #include "../Bindings/LuaState.h"
#include "SelfTests.h"
#include "WorldStorage/SchematicFileSerializer.h" #include "WorldStorage/SchematicFileSerializer.h"
#include "VerticalStrategy.h" #include "VerticalStrategy.h"
#include "../StringCompression.h" #include "../StringCompression.h"

1
src/OSSupport/NetworkInterfaceEnum.cpp
View File

@ -6,7 +6,6 @@
#include "Globals.h" #include "Globals.h"
#include "Network.h" #include "Network.h"
#include "event2/util.h" #include "event2/util.h"
#include "../SelfTests.h"
#ifdef _WIN32 #ifdef _WIN32
#include <IPHlpApi.h> #include <IPHlpApi.h>

6
src/Root.cpp
View File

@ -22,7 +22,6 @@
#include "IniFile.h" #include "IniFile.h"
#include "SettingsRepositoryInterface.h" #include "SettingsRepositoryInterface.h"
#include "OverridesSettingsRepository.h" #include "OverridesSettingsRepository.h"
#include "SelfTests.h"
#include "Logger.h" #include "Logger.h"
#include <iostream> #include <iostream>
@ -128,11 +127,6 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME);
#endif #endif
// Run the self-tests registered previously via cSelfTests::Register():
#ifdef SELF_TEST
cSelfTests::ExecuteAll();
#endif
cDeadlockDetect dd; cDeadlockDetect dd;
auto BeginTime = std::chrono::steady_clock::now(); auto BeginTime = std::chrono::steady_clock::now();

71
src/SelfTests.cpp
View File

@ -1,71 +0,0 @@
// SelfTests.h
// Implements the cSelfTests class representing the singleton used for registering self-tests
// This class is only declared if SELF_TEST macro is defined.
#include "Globals.h"
#include "SelfTests.h"
#ifdef SELF_TEST
cSelfTests::cSelfTests(void):
m_AllowRegistering(true)
{
}
cSelfTests & cSelfTests::Get(void)
{
static cSelfTests singleton;
return singleton;
}
void cSelfTests::Register(cSelfTests::SelfTestFunction a_FnToExecute, const AString & a_TestName)
{
ASSERT(Get().m_AllowRegistering);
Get().m_SelfTests.push_back(std::make_pair(a_FnToExecute, a_TestName));
}
void cSelfTests::ExecuteAll(void)
{
Get().m_AllowRegistering = false;
LOG("--- Performing self-tests ---");
for (auto & test: Get().m_SelfTests)
{
LOG("Performing self-test: %s", test.second.c_str());
try
{
test.first();
}
catch (const std::exception & exc)
{
LOGWARNING("Exception in test %s: %s", test.second.c_str(), exc.what());
}
catch (...)
{
LOGWARNING("Unknown exception in test %s", test.second.c_str());
}
} // for test - m_SelfTests[]
LOG("--- Self-tests finished ---");
}
#endif // SELF_TEST

51
src/SelfTests.h
View File

@ -1,51 +0,0 @@
// SelfTests.h
// Declares the cSelfTests class representing the singleton used for registering self-tests
// This class is only declared if SELF_TEST macro is defined.
#pragma once
#ifdef SELF_TEST
/** Singleton containing registered self-tests.
Used to schedule self-tests to run after the logging framework is initialized (#2228). */
class cSelfTests
{
public:
/** Returns the singleton instance of this class. */
static cSelfTests & Get(void);
// typedef void (* SelfTestFunction)(void);
typedef std::function<void(void)> SelfTestFunction;
/** Registers a self-test to be executed once the logging framework is initialized. */
static void Register(SelfTestFunction a_FnToExecute, const AString & a_TestName);
/** Executes all the registered self-tests. */
static void ExecuteAll(void);
protected:
typedef std::vector<std::pair<SelfTestFunction, AString>> SelfTestFunctions;
/** Functions (registered self-tests) to call once the logging framework is initialized. */
SelfTestFunctions m_SelfTests;
/** If true, tests may be registered. Set to false once the tests are executed, to detect tests that are registered too late. */
bool m_AllowRegistering;
cSelfTests(void);
};
#endif // SELF_TEST

28
tests/LoadablePieces/Stubs.cpp
View File

@ -6,7 +6,6 @@
#include "Globals.h" #include "Globals.h"
#include "BlockInfo.h" #include "BlockInfo.h"
#include "SelfTests.h"
#include "Bindings.h" #include "Bindings.h"
#include "Bindings/DeprecatedBindings.h" #include "Bindings/DeprecatedBindings.h"
#include "Bindings/LuaJson.h" #include "Bindings/LuaJson.h"
@ -272,30 +271,3 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE
cSelfTests::cSelfTests(void):
m_AllowRegistering(true)
{
}
cSelfTests & cSelfTests::Get(void)
{
static cSelfTests singleton;
return singleton;
}
void cSelfTests::Register(cSelfTests::SelfTestFunction a_TestFn, const AString & a_TestName)
{
}