saving from a test works

dDatabase/GameDatabase/CMakeLists.txt

@@ -8,9 +8,15 @@ foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 endforeach()
 
+add_subdirectory(TestSQL)
+
+foreach(file ${DDATABSE_DATABSES_TEST_SQL_SOURCES})
+	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "TestSQL/${file}")
+endforeach()
+
 add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
 target_include_directories(dDatabaseGame PUBLIC "."
-	"ITables" PRIVATE "MySQL"
+	"ITables" PRIVATE "MySQL" "TestSQL"
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 )

dDatabase/GameDatabase/Database.cpp

@@ -38,3 +38,8 @@ void Database::Destroy(std::string source) {
 		LOG("Trying to destroy database when it's not connected!");
 	}
 }
+
+void Database::_setDatabase(GameDatabase* const db) {
+	if (database) delete database;
+	database = db;
+}

dDatabase/GameDatabase/Database.h

@@ -9,4 +9,8 @@ namespace Database {
 	void Connect();
 	GameDatabase* Get();
 	void Destroy(std::string source = "");
+
+	// Used for assigning a test database as the handler for database logic.
+	// Do not use in production code.
+	void _setDatabase(GameDatabase* const db);
 };

dDatabase/GameDatabase/TestSQL/CMakeLists.txt

@@ -0,0 +1,4 @@
+SET(DDATABSE_DATABSES_TEST_SQL_SOURCES
+	"TestSQLDatabase.cpp"
+	PARENT_SCOPE
+)

dDatabase/GameDatabase/TestSQL/TestSQLDatabase.cpp

@@ -0,0 +1,290 @@
+#include "TestSQLDatabase.h"
+
+void TestSQLDatabase::Connect() {
+
+}
+
+void TestSQLDatabase::Destroy(std::string source) {
+
+}
+
+sql::PreparedStatement* TestSQLDatabase::CreatePreppedStmt(const std::string& query) {
+	return nullptr;
+}
+
+void TestSQLDatabase::Commit() {
+
+}
+
+bool TestSQLDatabase::GetAutoCommit() {
+	return {};
+}
+
+void TestSQLDatabase::SetAutoCommit(bool value) {
+
+}
+
+void TestSQLDatabase::ExecuteCustomQuery(const std::string_view query) {
+
+}
+
+std::optional<IServers::MasterInfo> TestSQLDatabase::GetMasterInfo() {
+	return {};
+}
+
+std::vector<std::string> TestSQLDatabase::GetApprovedCharacterNames() {
+	return {};
+}
+
+std::vector<FriendData> TestSQLDatabase::GetFriendsList(uint32_t charID) {
+	return {};
+}
+
+std::optional<IFriends::BestFriendStatus> TestSQLDatabase::GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
+	return {};
+}
+
+void TestSQLDatabase::SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) {
+
+}
+
+void TestSQLDatabase::AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) {
+
+}
+
+void TestSQLDatabase::RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) {
+
+}
+
+void TestSQLDatabase::UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) {
+
+}
+
+void TestSQLDatabase::DeleteUgcModelData(const LWOOBJID& modelId) {
+
+}
+
+void TestSQLDatabase::UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) {
+
+}
+
+std::vector<IUgc::Model> TestSQLDatabase::GetAllUgcModels() {
+	return {};
+}
+
+void TestSQLDatabase::CreateMigrationHistoryTable() {
+
+}
+
+bool TestSQLDatabase::IsMigrationRun(const std::string_view str) {
+	return {};
+}
+
+void TestSQLDatabase::InsertMigration(const std::string_view str) {
+
+}
+
+std::optional<ICharInfo::Info> TestSQLDatabase::GetCharacterInfo(const uint32_t charId) {
+	return {};
+}
+
+std::optional<ICharInfo::Info> TestSQLDatabase::GetCharacterInfo(const std::string_view charId) {
+	return {};
+}
+
+std::string TestSQLDatabase::GetCharacterXml(const uint32_t accountId) {
+	return {};
+}
+
+void TestSQLDatabase::UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) {
+
+}
+
+std::optional<IAccounts::Info> TestSQLDatabase::GetAccountInfo(const std::string_view username) {
+	return {};
+}
+
+void TestSQLDatabase::InsertNewCharacter(const ICharInfo::Info info) {
+
+}
+
+void TestSQLDatabase::InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) {
+
+}
+
+std::vector<uint32_t> TestSQLDatabase::GetAccountCharacterIds(uint32_t accountId) {
+	return {};
+}
+
+void TestSQLDatabase::DeleteCharacter(const uint32_t characterId) {
+
+}
+
+void TestSQLDatabase::SetCharacterName(const uint32_t characterId, const std::string_view name) {
+
+}
+
+void TestSQLDatabase::SetPendingCharacterName(const uint32_t characterId, const std::string_view name) {
+
+}
+
+void TestSQLDatabase::UpdateLastLoggedInCharacter(const uint32_t characterId) {
+
+}
+
+void TestSQLDatabase::SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) {
+
+}
+
+std::optional<IPetNames::Info> TestSQLDatabase::GetPetNameInfo(const LWOOBJID& petId) {
+	return {};
+}
+
+std::optional<IProperty::Info> TestSQLDatabase::GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) {
+	return {};
+}
+
+void TestSQLDatabase::UpdatePropertyModerationInfo(const IProperty::Info& info) {
+
+}
+
+void TestSQLDatabase::UpdatePropertyDetails(const IProperty::Info& info) {
+
+}
+
+void TestSQLDatabase::InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) {
+
+}
+
+std::vector<IPropertyContents::Model> TestSQLDatabase::GetPropertyModels(const LWOOBJID& propertyId) {
+	return {};
+}
+
+void TestSQLDatabase::RemoveUnreferencedUgcModels() {
+
+}
+
+void TestSQLDatabase::InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) {
+
+}
+
+void TestSQLDatabase::UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) {
+
+}
+
+void TestSQLDatabase::RemoveModel(const LWOOBJID& modelId) {
+
+}
+
+void TestSQLDatabase::UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) {
+
+}
+
+void TestSQLDatabase::InsertNewBugReport(const IBugReports::Info& info) {
+
+}
+
+void TestSQLDatabase::InsertCheatDetection(const IPlayerCheatDetections::Info& info) {
+
+}
+
+void TestSQLDatabase::InsertNewMail(const IMail::MailInfo& mail) {
+
+}
+
+void TestSQLDatabase::InsertNewUgcModel(std::istringstream& sd0Data, const uint32_t blueprintId, const uint32_t accountId, const uint32_t characterId) {
+
+}
+
+std::vector<IMail::MailInfo> TestSQLDatabase::GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) {
+	return {};
+}
+
+std::optional<IMail::MailInfo> TestSQLDatabase::GetMail(const uint64_t mailId) {
+	return {};
+}
+
+uint32_t TestSQLDatabase::GetUnreadMailCount(const uint32_t characterId) {
+	return {};
+}
+
+void TestSQLDatabase::MarkMailRead(const uint64_t mailId) {
+
+}
+
+void TestSQLDatabase::DeleteMail(const uint64_t mailId) {
+
+}
+
+void TestSQLDatabase::ClaimMailItem(const uint64_t mailId) {
+
+}
+
+void TestSQLDatabase::InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) {
+
+}
+
+void TestSQLDatabase::UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) {
+
+}
+
+void TestSQLDatabase::UpdateAccountBan(const uint32_t accountId, const bool banned) {
+
+}
+
+void TestSQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) {
+
+}
+
+void TestSQLDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
+
+}
+
+void TestSQLDatabase::SetMasterIp(const std::string_view ip, const uint32_t port) {
+
+}
+
+std::optional<uint32_t> TestSQLDatabase::GetCurrentPersistentId() {
+	return {};
+}
+
+void TestSQLDatabase::InsertDefaultPersistentId() {
+
+}
+
+void TestSQLDatabase::UpdatePersistentId(const uint32_t id) {
+
+}
+
+std::optional<uint32_t> TestSQLDatabase::GetDonationTotal(const uint32_t activityId) {
+	return {};
+}
+
+std::optional<bool> TestSQLDatabase::IsPlaykeyActive(const int32_t playkeyId) {
+	return {};
+}
+
+std::vector<IUgc::Model> TestSQLDatabase::GetUgcModels(const LWOOBJID& propertyId) {
+	return {};
+}
+
+void TestSQLDatabase::AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
+
+}
+
+void TestSQLDatabase::RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
+
+}
+
+std::vector<IIgnoreList::Info> TestSQLDatabase::GetIgnoreList(const uint32_t playerId) {
+	return {};
+}
+
+void TestSQLDatabase::InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) {
+
+}
+
+std::vector<uint32_t> TestSQLDatabase::GetRewardCodesByAccountID(const uint32_t account_id) {
+	return {};
+}
+

dDatabase/GameDatabase/TestSQL/TestSQLDatabase.h

@@ -0,0 +1,91 @@
+#ifndef TESTSQLDATABASE_H
+#define TESTSQLDATABASE_H
+
+#include "GameDatabase.h"
+
+class TestSQLDatabase : public GameDatabase {
+	void Connect() override;
+	void Destroy(std::string source = "") override;
+
+	sql::PreparedStatement* CreatePreppedStmt(const std::string& query) override;
+	void Commit() override;
+	bool GetAutoCommit() override;
+	void SetAutoCommit(bool value) override;
+	void ExecuteCustomQuery(const std::string_view query) override;
+
+	// Overloaded queries
+	std::optional<IServers::MasterInfo> GetMasterInfo() override;
+
+	std::vector<std::string> GetApprovedCharacterNames() override;
+
+	std::vector<FriendData> GetFriendsList(uint32_t charID) override;
+
+	std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) override;
+	void SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) override;
+	void AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
+	void RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
+	void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) override;
+	void DeleteUgcModelData(const LWOOBJID& modelId) override;
+	void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) override;
+	std::vector<IUgc::Model> GetAllUgcModels() override;
+	void CreateMigrationHistoryTable() override;
+	bool IsMigrationRun(const std::string_view str) override;
+	void InsertMigration(const std::string_view str) override;
+	std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) override;
+	std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view charId) override;
+	std::string GetCharacterXml(const uint32_t accountId) override;
+	void UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) override;
+	std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) override;
+	void InsertNewCharacter(const ICharInfo::Info info) override;
+	void InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) override;
+	std::vector<uint32_t> GetAccountCharacterIds(uint32_t accountId) override;
+	void DeleteCharacter(const uint32_t characterId) override;
+	void SetCharacterName(const uint32_t characterId, const std::string_view name) override;
+	void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) override;
+	void UpdateLastLoggedInCharacter(const uint32_t characterId) override;
+	void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) override;
+	std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) override;
+	std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) override;
+	void UpdatePropertyModerationInfo(const IProperty::Info& info) override;
+	void UpdatePropertyDetails(const IProperty::Info& info) override;
+	void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) override;
+	std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) override;
+	void RemoveUnreferencedUgcModels() override;
+	void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) override;
+	void UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) override;
+	void RemoveModel(const LWOOBJID& modelId) override;
+	void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) override;
+	void InsertNewBugReport(const IBugReports::Info& info) override;
+	void InsertCheatDetection(const IPlayerCheatDetections::Info& info) override;
+	void InsertNewMail(const IMail::MailInfo& mail) override;
+	void InsertNewUgcModel(
+		std::istringstream& sd0Data,
+		const uint32_t blueprintId,
+		const uint32_t accountId,
+		const uint32_t characterId) override;
+	std::vector<IMail::MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) override;
+	std::optional<IMail::MailInfo> GetMail(const uint64_t mailId) override;
+	uint32_t GetUnreadMailCount(const uint32_t characterId) override;
+	void MarkMailRead(const uint64_t mailId) override;
+	void DeleteMail(const uint64_t mailId) override;
+	void ClaimMailItem(const uint64_t mailId) override;
+	void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) override;
+	void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) override;
+	void UpdateAccountBan(const uint32_t accountId, const bool banned) override;
+	void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) override;
+	void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) override;
+	void SetMasterIp(const std::string_view ip, const uint32_t port) override;
+	std::optional<uint32_t> GetCurrentPersistentId() override;
+	void InsertDefaultPersistentId() override;
+	void UpdatePersistentId(const uint32_t id) override;
+	std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) override;
+	std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) override;
+	std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) override;
+	void AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
+	void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
+	std::vector<IIgnoreList::Info> GetIgnoreList(const uint32_t playerId) override;
+	void InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) override;
+	std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) override;
+};
+
+#endif  //!TESTSQLDATABASE_H

dGame/Character.cpp

@@ -40,8 +40,8 @@ void Character::UpdateInfoFromDatabase() {
 	auto charInfo = Database::Get()->GetCharacterInfo(m_ID);
 
 	if (charInfo) {
-		m_Name = charInfo->name; 
-		m_UnapprovedName = charInfo->pendingName; 
+		m_Name = charInfo->name;
+		m_UnapprovedName = charInfo->pendingName;
 		m_NameRejected = charInfo->needsRename;
 		m_PropertyCloneID = charInfo->cloneId;
 		m_PermissionMap = charInfo->permissionMap;

dGame/Character.h

@@ -38,6 +38,7 @@ public:
 
 	const std::string& GetXMLData() const { return m_XMLData; }
 	const tinyxml2::XMLDocument& GetXMLDoc() const { return m_Doc; }
+	void _setXmlDoc(tinyxml2::XMLDocument& doc) { doc.DeepCopy(&m_Doc); }
 
 	/**
 	 * Out of abundance of safety and clarity of what this saves, this is its own function.

tests/dGameTests/CMakeLists.txt

@@ -9,6 +9,7 @@ add_subdirectory(dGameMessagesTests)
 list(APPEND DGAMETEST_SOURCES ${DGAMEMESSAGES_TESTS})
 
 file(COPY ${GAMEMESSAGE_TESTBITSTREAMS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${COMPONENT_TEST_DATA} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Add the executable.  Remember to add all tests above this!
 add_executable(dGameTests ${DGAMETEST_SOURCES})

tests/dGameTests/GameDependencies.h

@@ -8,6 +8,7 @@
 #include "EntityInfo.h"
 #include "EntityManager.h"
 #include "dConfig.h"
+#include "dZoneManager.h"
 #include <gtest/gtest.h>
 
 class dZoneManager;
@@ -34,6 +35,8 @@ protected:
 		Game::server = new dServerMock();
 		Game::config = new dConfig("worldconfig.ini");
 		Game::entityManager = new EntityManager();
+		Game::zoneManager = new dZoneManager();
+		Game::zoneManager->LoadZone(LWOZONEID(1, 0, 0));
 
 		// Create a CDClientManager instance and load from defaults
 		CDClientManager::LoadValuesFromDefaults();
@@ -42,6 +45,7 @@ protected:
 	void TearDownDependencies() {
 		if (Game::server) delete Game::server;
 		if (Game::entityManager) delete Game::entityManager;
+		if (Game::zoneManager) delete Game::zoneManager;
 		if (Game::logger) {
 			Game::logger->Flush();
 			delete Game::logger;

tests/dGameTests/dComponentsTests/CMakeLists.txt

@@ -2,6 +2,7 @@ set(DCOMPONENTS_TESTS
 	"DestroyableComponentTests.cpp"
 	"PetComponentTests.cpp"
 	"SimplePhysicsComponentTests.cpp"
+	"SavingTests.cpp"
 )
 
 # Get the folder name and prepend it to the files above
@@ -10,3 +11,8 @@ list(TRANSFORM DCOMPONENTS_TESTS PREPEND "${thisFolderName}/")
 
 # Export to parent scope
 set(DCOMPONENTS_TESTS ${DCOMPONENTS_TESTS} PARENT_SCOPE)
+
+# Copy test files to testing directory
+add_subdirectory(TestData)
+list(TRANSFORM COMPONENT_TEST_DATA PREPEND "${thisFolderName}/")
+set(COMPONENT_TEST_DATA ${COMPONENT_TEST_DATA} PARENT_SCOPE)

tests/dGameTests/dComponentsTests/SavingTests.cpp

@@ -0,0 +1,31 @@
+#include "GameDependencies.h"
+#include "Character.h"
+#include "Entity.h"
+#include "tinyxml2.h"
+
+class SavingTest : public GameDependenciesTest {
+protected:
+	std::unique_ptr<Entity> entity;
+	std::unique_ptr<Character> character;
+	tinyxml2::XMLDocument doc;
+	void SetUp() override {
+		SetUpDependencies();
+		entity = std::make_unique<Entity>(1, GameDependenciesTest::info);
+		character = std::make_unique<Character>(1, nullptr);
+		doc.LoadFile("./test_xml_data.xml");
+		entity->SetCharacter(character.get());
+		character->_setXmlDoc(doc);
+		character->SetEntity(entity.get());
+	}
+
+	void TearDown() override {
+		entity->SetCharacter(nullptr);
+		entity.reset();
+		character.reset();
+		TearDownDependencies();
+	}
+};
+
+TEST_F(SavingTest, EntityLevelTest) {
+	character->SaveXMLToDatabase();
+}

tests/dGameTests/dComponentsTests/TestData/CMakeLists.txt

@@ -0,0 +1,10 @@
+set(COMPONENT_TEST_DATA
+	"test_xml_data.xml"
+)
+
+# Get the folder name and prepend it to the files above
+get_filename_component(thisFolderName ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+list(TRANSFORM COMPONENT_TEST_DATA PREPEND "${thisFolderName}/")
+
+# Export our list of files
+set(COMPONENT_TEST_DATA ${COMPONENT_TEST_DATA} PARENT_SCOPE)