From c2931a04e1bfd760acaea13f844e998a096f3077 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Fri, 16 Sep 2016 11:04:28 +0200
Subject: [PATCH] Fix names in unittests

---
 README.md                                  |  2 +-
 premake5.lua                               |  2 +-
 src/Components/Loader.cpp                  | 12 +++++++++---
 src/Components/Loader.hpp                  |  2 +-
 src/Components/Modules/AntiCheat.hpp       |  2 +-
 src/Components/Modules/AssetHandler.hpp    |  2 +-
 src/Components/Modules/Auth.hpp            |  2 +-
 src/Components/Modules/Bans.hpp            |  2 +-
 src/Components/Modules/BitMessage.hpp      |  2 +-
 src/Components/Modules/Colors.hpp          |  2 +-
 src/Components/Modules/Command.hpp         |  2 +-
 src/Components/Modules/ConnectProtocol.hpp |  2 +-
 src/Components/Modules/Console.hpp         |  2 +-
 src/Components/Modules/D3D9Ex.hpp          |  2 +-
 src/Components/Modules/Dedicated.hpp       |  2 +-
 src/Components/Modules/Discovery.hpp       |  2 +-
 src/Components/Modules/Download.hpp        |  2 +-
 src/Components/Modules/Dvar.hpp            |  2 +-
 src/Components/Modules/Exception.hpp       |  2 +-
 src/Components/Modules/FastFiles.hpp       |  2 +-
 src/Components/Modules/FileSystem.hpp      |  2 +-
 src/Components/Modules/Flags.hpp           |  2 +-
 src/Components/Modules/IPCPipe.hpp         |  2 +-
 src/Components/Modules/Lean.hpp            |  2 +-
 src/Components/Modules/Localization.hpp    |  2 +-
 src/Components/Modules/Logger.hpp          |  2 +-
 src/Components/Modules/Maps.hpp            |  2 +-
 src/Components/Modules/Materials.hpp       |  2 +-
 src/Components/Modules/Menus.hpp           |  2 +-
 src/Components/Modules/MinidumpUpload.hpp  |  2 +-
 src/Components/Modules/ModList.hpp         |  2 +-
 src/Components/Modules/ModelSurfs.hpp      |  4 ++++
 src/Components/Modules/MusicalTalent.hpp   |  2 +-
 src/Components/Modules/Network.hpp         |  2 +-
 src/Components/Modules/News.hpp            |  2 +-
 src/Components/Modules/Node.hpp            |  2 +-
 src/Components/Modules/Party.hpp           |  2 +-
 src/Components/Modules/PlayerName.hpp      |  2 +-
 src/Components/Modules/Playlist.hpp        |  2 +-
 src/Components/Modules/QuickPatch.hpp      |  2 +-
 src/Components/Modules/RCon.hpp            |  2 +-
 src/Components/Modules/RawFiles.hpp        |  2 +-
 src/Components/Modules/Renderer.hpp        |  2 +-
 src/Components/Modules/Script.hpp          |  2 +-
 src/Components/Modules/ServerInfo.hpp      |  2 +-
 src/Components/Modules/ServerList.hpp      |  2 +-
 src/Components/Modules/Singleton.hpp       |  2 +-
 src/Components/Modules/StringTable.hpp     |  2 +-
 src/Components/Modules/StructuredData.hpp  |  2 +-
 src/Components/Modules/Theatre.hpp         |  2 +-
 src/Components/Modules/Toast.hpp           |  2 +-
 src/Components/Modules/UIFeeder.hpp        |  2 +-
 src/Components/Modules/UIScript.hpp        |  2 +-
 src/Components/Modules/Weapon.hpp          |  2 +-
 src/Components/Modules/Window.hpp          |  2 +-
 src/Components/Modules/ZoneBuilder.hpp     |  2 +-
 56 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 3f4c6278..1410047c 100644
--- a/README.md
+++ b/README.md
@@ -19,5 +19,5 @@
 | `--force-minidump-upload` | Upload minidumps even for Debug builds. |
 | `--disable-bitmessage` | Disable use of BitMessage completely. |
 | `--disable-node-log` | Disable debugging messages for Nodes in Debug builds. |
-| `--disable-base128` | Disable debugging messages for Nodes in Debug builds. |
+| `--disable-base128` | Disable base128 encoding for minidumps. |
 | `--no-new-structure` | Do not use new virtual path structure (separating headers and source files). |
diff --git a/premake5.lua b/premake5.lua
index 476a647a..7aef769c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -80,7 +80,7 @@ newoption {
 
 newoption {
 	trigger = "disable-base128",
-	description = "Disable debugging messages for Nodes in Debug builds."
+	description = "Disable base128 encoding for minidumps."
 }
 
 newaction {
diff --git a/src/Components/Loader.cpp b/src/Components/Loader.cpp
index 468c8e7a..c47fa11f 100644
--- a/src/Components/Loader.cpp
+++ b/src/Components/Loader.cpp
@@ -79,7 +79,10 @@ namespace Components
 		for (auto component : Loader::Components)
 		{
 #ifdef DEBUG
-			Logger::Print("Unregistering component: %s\n", component->GetName());
+			if(!Loader::PerformingUnitTests())
+			{
+				Logger::Print("Unregistering component: %s\n", component->GetName());
+			}
 #endif
 			delete component;
 		}
@@ -95,7 +98,7 @@ namespace Components
 
 		for (auto component : Loader::Components)
 		{
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 			Logger::Print("Testing '%s'...\n", component->GetName());
 #endif
 			auto startTime = std::chrono::high_resolution_clock::now();
@@ -122,7 +125,10 @@ namespace Components
 		if (component)
 		{
 #ifdef DEBUG
-			Logger::Print("Component registered: %s\n", component->GetName());
+			if(!Loader::PerformingUnitTests())
+			{
+				Logger::Print("Component registered: %s\n", component->GetName());
+			}
 #endif
 			Loader::Components.push_back(component);
 		}
diff --git a/src/Components/Loader.hpp b/src/Components/Loader.hpp
index 71cd546b..a96a375a 100644
--- a/src/Components/Loader.hpp
+++ b/src/Components/Loader.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Component() {};
 		virtual ~Component() {};
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		virtual const char* GetName() { return "Unknown"; };
 #endif
 
diff --git a/src/Components/Modules/AntiCheat.hpp b/src/Components/Modules/AntiCheat.hpp
index 8936c94b..364abd4c 100644
--- a/src/Components/Modules/AntiCheat.hpp
+++ b/src/Components/Modules/AntiCheat.hpp
@@ -11,7 +11,7 @@ namespace Components
 		AntiCheat();
 		~AntiCheat();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "AntiCheat"; };
 #endif
 
diff --git a/src/Components/Modules/AssetHandler.hpp b/src/Components/Modules/AssetHandler.hpp
index 702dd429..9ff1c981 100644
--- a/src/Components/Modules/AssetHandler.hpp
+++ b/src/Components/Modules/AssetHandler.hpp
@@ -20,7 +20,7 @@ namespace Components
 		AssetHandler();
 		~AssetHandler();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "AssetHandler"; };
 #endif
 
diff --git a/src/Components/Modules/Auth.hpp b/src/Components/Modules/Auth.hpp
index dabac69e..9f59e6cc 100644
--- a/src/Components/Modules/Auth.hpp
+++ b/src/Components/Modules/Auth.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Auth();
 		~Auth();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Auth"; };
 #endif
 
diff --git a/src/Components/Modules/Bans.hpp b/src/Components/Modules/Bans.hpp
index a03bee33..06ff1560 100644
--- a/src/Components/Modules/Bans.hpp
+++ b/src/Components/Modules/Bans.hpp
@@ -8,7 +8,7 @@ namespace Components
 		Bans();
 		~Bans();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Bans"; };
 #endif
 
diff --git a/src/Components/Modules/BitMessage.hpp b/src/Components/Modules/BitMessage.hpp
index fd586ebb..e949d833 100644
--- a/src/Components/Modules/BitMessage.hpp
+++ b/src/Components/Modules/BitMessage.hpp
@@ -13,7 +13,7 @@ namespace Components
 		BitMessage();
 		~BitMessage();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "BitMessage"; };
 #endif
 
diff --git a/src/Components/Modules/Colors.hpp b/src/Components/Modules/Colors.hpp
index 1719cc65..51bfc2b4 100644
--- a/src/Components/Modules/Colors.hpp
+++ b/src/Components/Modules/Colors.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Colors();
 		~Colors();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Colors"; };
 #endif
 
diff --git a/src/Components/Modules/Command.hpp b/src/Components/Modules/Command.hpp
index b429ec6c..19b51a45 100644
--- a/src/Components/Modules/Command.hpp
+++ b/src/Components/Modules/Command.hpp
@@ -26,7 +26,7 @@ namespace Components
 		Command();
 		~Command();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Command"; };
 #endif
 
diff --git a/src/Components/Modules/ConnectProtocol.hpp b/src/Components/Modules/ConnectProtocol.hpp
index a82290b7..dc463328 100644
--- a/src/Components/Modules/ConnectProtocol.hpp
+++ b/src/Components/Modules/ConnectProtocol.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		ConnectProtocol();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "ConnectProtocol"; };
 #endif
 
diff --git a/src/Components/Modules/Console.hpp b/src/Components/Modules/Console.hpp
index 49d7e1e4..e4ccf8fb 100644
--- a/src/Components/Modules/Console.hpp
+++ b/src/Components/Modules/Console.hpp
@@ -9,7 +9,7 @@ namespace Components
 		Console();
 		~Console();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Console"; };
 #endif
 
diff --git a/src/Components/Modules/D3D9Ex.hpp b/src/Components/Modules/D3D9Ex.hpp
index 83d02106..225c5335 100644
--- a/src/Components/Modules/D3D9Ex.hpp
+++ b/src/Components/Modules/D3D9Ex.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		D3D9Ex();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "D3D9Ex"; };
 #endif
 
diff --git a/src/Components/Modules/Dedicated.hpp b/src/Components/Modules/Dedicated.hpp
index 27b39c5e..427a337a 100644
--- a/src/Components/Modules/Dedicated.hpp
+++ b/src/Components/Modules/Dedicated.hpp
@@ -8,7 +8,7 @@ namespace Components
 		Dedicated();
 		~Dedicated();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Dedicated"; };
 #endif
 
diff --git a/src/Components/Modules/Discovery.hpp b/src/Components/Modules/Discovery.hpp
index 3c37c498..85a87fc4 100644
--- a/src/Components/Modules/Discovery.hpp
+++ b/src/Components/Modules/Discovery.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Discovery();
 		~Discovery();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Discovery"; };
 #endif
 
diff --git a/src/Components/Modules/Download.hpp b/src/Components/Modules/Download.hpp
index 7a32e4c0..81c6906d 100644
--- a/src/Components/Modules/Download.hpp
+++ b/src/Components/Modules/Download.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Download();
 		~Download();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Download"; };
 #endif
 
diff --git a/src/Components/Modules/Dvar.hpp b/src/Components/Modules/Dvar.hpp
index 27d03870..7faa1e37 100644
--- a/src/Components/Modules/Dvar.hpp
+++ b/src/Components/Modules/Dvar.hpp
@@ -42,7 +42,7 @@ namespace Components
 		Dvar();
 		~Dvar();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Dvar"; };
 #endif
 
diff --git a/src/Components/Modules/Exception.hpp b/src/Components/Modules/Exception.hpp
index 9418fe13..71c4d35e 100644
--- a/src/Components/Modules/Exception.hpp
+++ b/src/Components/Modules/Exception.hpp
@@ -8,7 +8,7 @@ namespace Components
 		Exception();
 		~Exception();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Exception"; };
 #endif
 		static LPTOP_LEVEL_EXCEPTION_FILTER Hook();
diff --git a/src/Components/Modules/FastFiles.hpp b/src/Components/Modules/FastFiles.hpp
index 4797648b..6dd9bc44 100644
--- a/src/Components/Modules/FastFiles.hpp
+++ b/src/Components/Modules/FastFiles.hpp
@@ -6,7 +6,7 @@ namespace Components
 		FastFiles();
 		~FastFiles();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "FastFiles"; };
 #endif
 
diff --git a/src/Components/Modules/FileSystem.hpp b/src/Components/Modules/FileSystem.hpp
index 98adc7dc..554710db 100644
--- a/src/Components/Modules/FileSystem.hpp
+++ b/src/Components/Modules/FileSystem.hpp
@@ -41,7 +41,7 @@ namespace Components
 
 		FileSystem();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "FileSystem"; };
 #endif
 
diff --git a/src/Components/Modules/Flags.hpp b/src/Components/Modules/Flags.hpp
index dbbf1322..b2ec15a5 100644
--- a/src/Components/Modules/Flags.hpp
+++ b/src/Components/Modules/Flags.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Flags();
 		~Flags();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Flags"; };
 #endif
 
diff --git a/src/Components/Modules/IPCPipe.hpp b/src/Components/Modules/IPCPipe.hpp
index 2d851044..7795b3f6 100644
--- a/src/Components/Modules/IPCPipe.hpp
+++ b/src/Components/Modules/IPCPipe.hpp
@@ -63,7 +63,7 @@ namespace Components
 		IPCPipe();
 		~IPCPipe();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "IPCPipe"; };
 #endif
 
diff --git a/src/Components/Modules/Lean.hpp b/src/Components/Modules/Lean.hpp
index f2a8fe78..68c7c6a6 100644
--- a/src/Components/Modules/Lean.hpp
+++ b/src/Components/Modules/Lean.hpp
@@ -8,7 +8,7 @@ namespace Components
 	public:
 		Lean();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Lean"; };
 #endif
 
diff --git a/src/Components/Modules/Localization.hpp b/src/Components/Modules/Localization.hpp
index a7a27bba..58dc2234 100644
--- a/src/Components/Modules/Localization.hpp
+++ b/src/Components/Modules/Localization.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Localization();
 		~Localization();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Localization"; };
 #endif
 
diff --git a/src/Components/Modules/Logger.hpp b/src/Components/Modules/Logger.hpp
index 8597cddc..ae375b4f 100644
--- a/src/Components/Modules/Logger.hpp
+++ b/src/Components/Modules/Logger.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Logger();
 		~Logger();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Logger"; };
 #endif
 
diff --git a/src/Components/Modules/Maps.hpp b/src/Components/Modules/Maps.hpp
index 0f394048..d6b04dcc 100644
--- a/src/Components/Modules/Maps.hpp
+++ b/src/Components/Modules/Maps.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Maps();
 		~Maps();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Maps"; };
 #endif
 
diff --git a/src/Components/Modules/Materials.hpp b/src/Components/Modules/Materials.hpp
index 2066130f..b04e1723 100644
--- a/src/Components/Modules/Materials.hpp
+++ b/src/Components/Modules/Materials.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Materials();
 		~Materials();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Materials"; };
 #endif
 
diff --git a/src/Components/Modules/Menus.hpp b/src/Components/Modules/Menus.hpp
index 8711d718..e94db157 100644
--- a/src/Components/Modules/Menus.hpp
+++ b/src/Components/Modules/Menus.hpp
@@ -9,7 +9,7 @@ namespace Components
 		Menus();
 		~Menus();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Menus"; };
 #endif
 
diff --git a/src/Components/Modules/MinidumpUpload.hpp b/src/Components/Modules/MinidumpUpload.hpp
index 6c686953..d51ce5b8 100644
--- a/src/Components/Modules/MinidumpUpload.hpp
+++ b/src/Components/Modules/MinidumpUpload.hpp
@@ -36,7 +36,7 @@ namespace Components
 	class MinidumpUpload : public Component
 	{
 	public:
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "MinidumpUpload"; };
 #endif
 		MinidumpUpload();
diff --git a/src/Components/Modules/ModList.hpp b/src/Components/Modules/ModList.hpp
index 4781a8f2..67f0d534 100644
--- a/src/Components/Modules/ModList.hpp
+++ b/src/Components/Modules/ModList.hpp
@@ -6,7 +6,7 @@ namespace Components
 		ModList();
 		~ModList();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "ModList"; };
 #endif
 
diff --git a/src/Components/Modules/ModelSurfs.hpp b/src/Components/Modules/ModelSurfs.hpp
index 7754a195..4a68f7b1 100644
--- a/src/Components/Modules/ModelSurfs.hpp
+++ b/src/Components/Modules/ModelSurfs.hpp
@@ -5,6 +5,10 @@ namespace Components
 	public:
 		ModelSurfs();
 		~ModelSurfs();
+		
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
+		const char* GetName() { return "ModelSurfs"; };
+#endif
 
 	private:
 		static std::map<void*, IUnknown*> BufferMap;
diff --git a/src/Components/Modules/MusicalTalent.hpp b/src/Components/Modules/MusicalTalent.hpp
index d5bc2779..6e31399d 100644
--- a/src/Components/Modules/MusicalTalent.hpp
+++ b/src/Components/Modules/MusicalTalent.hpp
@@ -6,7 +6,7 @@ namespace Components
 		MusicalTalent();
 		~MusicalTalent();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "MusicalTalent"; };
 #endif
 
diff --git a/src/Components/Modules/Network.hpp b/src/Components/Modules/Network.hpp
index 7bc44825..1888d73e 100644
--- a/src/Components/Modules/Network.hpp
+++ b/src/Components/Modules/Network.hpp
@@ -56,7 +56,7 @@ namespace Components
 		Network();
 		~Network();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Network"; };
 #endif
 
diff --git a/src/Components/Modules/News.hpp b/src/Components/Modules/News.hpp
index 924e89c4..5cbc4cbd 100644
--- a/src/Components/Modules/News.hpp
+++ b/src/Components/Modules/News.hpp
@@ -6,7 +6,7 @@ namespace Components
 		News();
 		~News();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "News"; };
 #endif
 
diff --git a/src/Components/Modules/Node.hpp b/src/Components/Modules/Node.hpp
index 84e3061d..14c4eb24 100644
--- a/src/Components/Modules/Node.hpp
+++ b/src/Components/Modules/Node.hpp
@@ -17,7 +17,7 @@ namespace Components
 		Node();
 		~Node();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Node"; };
 #endif
 
diff --git a/src/Components/Modules/Party.hpp b/src/Components/Modules/Party.hpp
index ca2e033e..c9f3633d 100644
--- a/src/Components/Modules/Party.hpp
+++ b/src/Components/Modules/Party.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Party();
 		~Party();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Party"; };
 #endif
 
diff --git a/src/Components/Modules/PlayerName.hpp b/src/Components/Modules/PlayerName.hpp
index d9442ab3..909fcae5 100644
--- a/src/Components/Modules/PlayerName.hpp
+++ b/src/Components/Modules/PlayerName.hpp
@@ -6,7 +6,7 @@ namespace Components
 		PlayerName();
 		~PlayerName();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "PlayerName"; };
 #endif
 
diff --git a/src/Components/Modules/Playlist.hpp b/src/Components/Modules/Playlist.hpp
index 56f4a815..15cbfa5a 100644
--- a/src/Components/Modules/Playlist.hpp
+++ b/src/Components/Modules/Playlist.hpp
@@ -8,7 +8,7 @@ namespace Components
 		Playlist();
 		~Playlist();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Playlist"; };
 #endif
 
diff --git a/src/Components/Modules/QuickPatch.hpp b/src/Components/Modules/QuickPatch.hpp
index 263f19ab..c85fffae 100644
--- a/src/Components/Modules/QuickPatch.hpp
+++ b/src/Components/Modules/QuickPatch.hpp
@@ -8,7 +8,7 @@ namespace Components
 		QuickPatch();
 		~QuickPatch();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "QuickPatch"; };
 #endif
 
diff --git a/src/Components/Modules/RCon.hpp b/src/Components/Modules/RCon.hpp
index d15654dd..787cf019 100644
--- a/src/Components/Modules/RCon.hpp
+++ b/src/Components/Modules/RCon.hpp
@@ -6,7 +6,7 @@ namespace Components
 		RCon();
 		~RCon();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "RCon"; };
 #endif
 
diff --git a/src/Components/Modules/RawFiles.hpp b/src/Components/Modules/RawFiles.hpp
index edbea7b8..95ace80d 100644
--- a/src/Components/Modules/RawFiles.hpp
+++ b/src/Components/Modules/RawFiles.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		RawFiles();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "RawFiles"; };
 #endif
 
diff --git a/src/Components/Modules/Renderer.hpp b/src/Components/Modules/Renderer.hpp
index b1ceecf0..c4bb522e 100644
--- a/src/Components/Modules/Renderer.hpp
+++ b/src/Components/Modules/Renderer.hpp
@@ -9,7 +9,7 @@ namespace Components
 		Renderer();
 		~Renderer();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Renderer"; };
 #endif
 
diff --git a/src/Components/Modules/Script.hpp b/src/Components/Modules/Script.hpp
index 2fda469f..f24abcc8 100644
--- a/src/Components/Modules/Script.hpp
+++ b/src/Components/Modules/Script.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Script();
 		~Script();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Script"; };
 #endif
 
diff --git a/src/Components/Modules/ServerInfo.hpp b/src/Components/Modules/ServerInfo.hpp
index 8c180a0a..9c9a24bb 100644
--- a/src/Components/Modules/ServerInfo.hpp
+++ b/src/Components/Modules/ServerInfo.hpp
@@ -6,7 +6,7 @@ namespace Components
 		ServerInfo();
 		~ServerInfo();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "ServerInfo"; };
 #endif
 
diff --git a/src/Components/Modules/ServerList.hpp b/src/Components/Modules/ServerList.hpp
index fd7ec8e0..354b573e 100644
--- a/src/Components/Modules/ServerList.hpp
+++ b/src/Components/Modules/ServerList.hpp
@@ -27,7 +27,7 @@ namespace Components
 		ServerList();
 		~ServerList();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "ServerList"; };
 #endif
 
diff --git a/src/Components/Modules/Singleton.hpp b/src/Components/Modules/Singleton.hpp
index e1b04df0..b6b9915e 100644
--- a/src/Components/Modules/Singleton.hpp
+++ b/src/Components/Modules/Singleton.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		Singleton();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Singleton"; };
 #endif
 
diff --git a/src/Components/Modules/StringTable.hpp b/src/Components/Modules/StringTable.hpp
index d85179f9..f7f3e96f 100644
--- a/src/Components/Modules/StringTable.hpp
+++ b/src/Components/Modules/StringTable.hpp
@@ -6,7 +6,7 @@ namespace Components
 		StringTable();
 		~StringTable();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "StringTable"; };
 #endif
 
diff --git a/src/Components/Modules/StructuredData.hpp b/src/Components/Modules/StructuredData.hpp
index 70ba93b0..2ecf992f 100644
--- a/src/Components/Modules/StructuredData.hpp
+++ b/src/Components/Modules/StructuredData.hpp
@@ -24,7 +24,7 @@ namespace Components
 		StructuredData();
 		~StructuredData();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "StructuredData"; };
 #endif
 
diff --git a/src/Components/Modules/Theatre.hpp b/src/Components/Modules/Theatre.hpp
index 0712c8d0..cdd4672f 100644
--- a/src/Components/Modules/Theatre.hpp
+++ b/src/Components/Modules/Theatre.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		Theatre();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Theatre"; };
 #endif
 
diff --git a/src/Components/Modules/Toast.hpp b/src/Components/Modules/Toast.hpp
index 99b0b759..fa3e1eec 100644
--- a/src/Components/Modules/Toast.hpp
+++ b/src/Components/Modules/Toast.hpp
@@ -6,7 +6,7 @@ namespace Components
 		Toast();
 		~Toast();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Toast"; };
 #endif
 
diff --git a/src/Components/Modules/UIFeeder.hpp b/src/Components/Modules/UIFeeder.hpp
index 4424c1bb..d406fc4a 100644
--- a/src/Components/Modules/UIFeeder.hpp
+++ b/src/Components/Modules/UIFeeder.hpp
@@ -17,7 +17,7 @@ namespace Components
 		UIFeeder();
 		~UIFeeder();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "UIFeeder"; };
 #endif
 
diff --git a/src/Components/Modules/UIScript.hpp b/src/Components/Modules/UIScript.hpp
index 8fb3502a..7fe3b8f8 100644
--- a/src/Components/Modules/UIScript.hpp
+++ b/src/Components/Modules/UIScript.hpp
@@ -6,7 +6,7 @@ namespace Components
 		UIScript();
 		~UIScript();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "UIScript"; };
 #endif
 
diff --git a/src/Components/Modules/Weapon.hpp b/src/Components/Modules/Weapon.hpp
index 5e167ccd..6a91651e 100644
--- a/src/Components/Modules/Weapon.hpp
+++ b/src/Components/Modules/Weapon.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		Weapon();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Weapon"; };
 #endif
 
diff --git a/src/Components/Modules/Window.hpp b/src/Components/Modules/Window.hpp
index 9eccff0d..98d85f46 100644
--- a/src/Components/Modules/Window.hpp
+++ b/src/Components/Modules/Window.hpp
@@ -5,7 +5,7 @@ namespace Components
 	public:
 		Window();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "Window"; };
 #endif
 
diff --git a/src/Components/Modules/ZoneBuilder.hpp b/src/Components/Modules/ZoneBuilder.hpp
index d5513982..57ad47e7 100644
--- a/src/Components/Modules/ZoneBuilder.hpp
+++ b/src/Components/Modules/ZoneBuilder.hpp
@@ -73,7 +73,7 @@ namespace Components
 
 		ZoneBuilder();
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
 		const char* GetName() { return "ZoneBuilder"; };
 #endif