From f19f37ae3eff84161f86e62a26fbd8b68f8f91a9 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 7 Dec 2024 15:29:33 +0100
Subject: make SaveManager no longer a singleton

---
 src/test/SaveManagerTest.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/test/SaveManagerTest.cpp

(limited to 'src/test/SaveManagerTest.cpp')

diff --git a/src/test/SaveManagerTest.cpp b/src/test/SaveManagerTest.cpp
new file mode 100644
index 0000000..a1efc33
--- /dev/null
+++ b/src/test/SaveManagerTest.cpp
@@ -0,0 +1,41 @@
+#include <gtest/gtest.h>
+
+#include <crepe/manager/SaveManager.h>
+#include <crepe/facade/DB.h>
+#include <crepe/ValueBroker.h>
+
+using namespace std;
+using namespace crepe;
+using namespace testing;
+
+class SaveManagerTest : public Test {
+	Mediator m;
+	class TestSaveManager : public SaveManager {
+		using SaveManager::SaveManager;
+
+		// in-memory database for testing
+		DB db{};
+		virtual DB & get_db() override { return this->db; }
+	};
+
+public:
+	TestSaveManager mgr{m};
+};
+
+TEST_F(SaveManagerTest, ReadWrite) {
+	ASSERT_FALSE(mgr.has("foo"));
+	mgr.set<string>("foo", "bar");
+	ASSERT_TRUE(mgr.has("foo"));
+
+	ValueBroker value = mgr.get<string>("foo");
+	EXPECT_EQ(value.get(), "bar");
+}
+
+TEST_F(SaveManagerTest, DefaultValue) {
+	ValueBroker value = mgr.get<int>("foo", 3);
+
+	ASSERT_EQ(value.get(), 3);
+	value.set(5);
+	ASSERT_EQ(value.get(), 5);
+}
+
-- 
cgit v1.2.3


From dd8bbe2fde97786ab29490bc7ba9962deb08fb4c Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 7 Dec 2024 16:01:59 +0100
Subject: `make format`

---
 src/crepe/api/Script.cpp           | 5 +----
 src/crepe/api/Script.h             | 2 +-
 src/test/SaveManagerTest.cpp       | 5 ++---
 src/test/ScriptSaveManagerTest.cpp | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/test/SaveManagerTest.cpp')

diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp
index 961e6e7..753a9e3 100644
--- a/src/crepe/api/Script.cpp
+++ b/src/crepe/api/Script.cpp
@@ -24,7 +24,4 @@ void Script::set_next_scene(const string & name) {
 	mgr.set_next_scene(name);
 }
 
-SaveManager & Script::get_save_manager() const {
-	return this->mediator->save_manager;
-}
-
+SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; }
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 024f1d7..0d59ab6 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -2,12 +2,12 @@
 
 #include <vector>
 
+#include "../ValueBroker.h"
 #include "../manager/EventManager.h"
 #include "../manager/Mediator.h"
 #include "../system/CollisionSystem.h"
 #include "../types.h"
 #include "../util/OptionalRef.h"
-#include "../ValueBroker.h"
 
 namespace crepe {
 
diff --git a/src/test/SaveManagerTest.cpp b/src/test/SaveManagerTest.cpp
index a1efc33..e9b0c29 100644
--- a/src/test/SaveManagerTest.cpp
+++ b/src/test/SaveManagerTest.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <crepe/manager/SaveManager.h>
-#include <crepe/facade/DB.h>
 #include <crepe/ValueBroker.h>
+#include <crepe/facade/DB.h>
+#include <crepe/manager/SaveManager.h>
 
 using namespace std;
 using namespace crepe;
@@ -38,4 +38,3 @@ TEST_F(SaveManagerTest, DefaultValue) {
 	value.set(5);
 	ASSERT_EQ(value.get(), 5);
 }
-
diff --git a/src/test/ScriptSaveManagerTest.cpp b/src/test/ScriptSaveManagerTest.cpp
index 098afa0..64403c4 100644
--- a/src/test/ScriptSaveManagerTest.cpp
+++ b/src/test/ScriptSaveManagerTest.cpp
@@ -4,8 +4,8 @@
 #define private public
 #define protected public
 
-#include <crepe/manager/SaveManager.h>
 #include <crepe/facade/DB.h>
+#include <crepe/manager/SaveManager.h>
 
 #include "ScriptTest.h"
 
@@ -33,4 +33,3 @@ TEST_F(ScriptSaveManagerTest, GetSaveManager) {
 
 	EXPECT_EQ(&mgr, &save_mgr);
 }
-
-- 
cgit v1.2.3