Fix names in unittests

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). |

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 {

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);
 		}

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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();

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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();

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
 

src/Components/Modules/ModelSurfs.hpp

@@ -6,6 +6,10 @@ namespace Components
 		ModelSurfs();
 		~ModelSurfs();
 		
+#if defined(DEBUG) || defined(FORCE_UNIT_TESTS)
+		const char* GetName() { return "ModelSurfs"; };
+#endif
+
 	private:
 		static std::map<void*, IUnknown*> BufferMap;
 		static std::map<void*, Game::CModelAllocData*> AllocMap;

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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