merge `master`

4 files changed, 55 insertions, 21 deletions

diff --git a/src/test/AssetTest.cpp b/src/test/AssetTest.cpp
index 8aa7629..93fd6a9 100644
--- a/src/test/AssetTest.cpp
+++ b/src/test/AssetTest.cpp
@@ -7,17 +7,12 @@ using namespace std;
 using namespace crepe;
 using namespace testing;
 
-class AssetTest : public Test {
-public:
-	Config & cfg = Config::get_instance();
-	void SetUp() override { this->cfg.asset.root_pattern = ".crepe-root"; }
-};
-
-TEST_F(AssetTest, Existant) { ASSERT_NO_THROW(Asset{"asset/texture/img.png"}); }
+TEST(AssetTest, Existant) { ASSERT_NO_THROW(Asset{"asset/texture/img.png"}); }
 
-TEST_F(AssetTest, Nonexistant) { ASSERT_ANY_THROW(Asset{"asset/nonexistant"}); }
+TEST(AssetTest, Nonexistant) { ASSERT_ANY_THROW(Asset{"asset/nonexistant"}); }
 
-TEST_F(AssetTest, Rootless) {
+TEST(AssetTest, Rootless) {
+	Config & cfg = Config::get_instance();
 	cfg.asset.root_pattern.clear();
 
 	string arbitrary = "\\/this is / /../passed through as-is";
diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp
index ac479d3..f37fb56 100644
--- a/src/test/RenderSystemTest.cpp
+++ b/src/test/RenderSystemTest.cpp
@@ -30,7 +30,7 @@ public:
 
 	void SetUp() override {
 		auto & sprite1
-			= entity1.add_component<Sprite>(make_shared<Texture>("../asset/texture/img.png"),
+			= entity1.add_component<Sprite>(make_shared<Texture>("asset/texture/img.png"),
 											Color(0, 0, 0, 0), FlipSettings{false, false});
 		ASSERT_NE(sprite1.sprite_image.get(), nullptr);
 		sprite1.order_in_layer = 5;
@@ -38,7 +38,7 @@ public:
 		EXPECT_EQ(sprite1.order_in_layer, 5);
 		EXPECT_EQ(sprite1.sorting_in_layer, 5);
 		auto & sprite2
-			= entity2.add_component<Sprite>(make_shared<Texture>("../asset/texture/img.png"),
+			= entity2.add_component<Sprite>(make_shared<Texture>("asset/texture/img.png"),
 											Color(0, 0, 0, 0), FlipSettings{false, false});
 		ASSERT_NE(sprite2.sprite_image.get(), nullptr);
 		sprite2.sorting_in_layer = 2;
@@ -48,7 +48,7 @@ public:
 		EXPECT_EQ(sprite2.order_in_layer, 1);
 
 		auto & sprite3
-			= entity3.add_component<Sprite>(make_shared<Texture>("../asset/texture/img.png"),
+			= entity3.add_component<Sprite>(make_shared<Texture>("asset/texture/img.png"),
 											Color(0, 0, 0, 0), FlipSettings{false, false});
 		ASSERT_NE(sprite3.sprite_image.get(), nullptr);
 		sprite3.sorting_in_layer = 1;
@@ -58,7 +58,7 @@ public:
 		EXPECT_EQ(sprite3.order_in_layer, 2);
 
 		auto & sprite4
-			= entity4.add_component<Sprite>(make_shared<Texture>("../asset/texture/img.png"),
+			= entity4.add_component<Sprite>(make_shared<Texture>("asset/texture/img.png"),
 											Color(0, 0, 0, 0), FlipSettings{false, false});
 		ASSERT_NE(sprite4.sprite_image.get(), nullptr);
 		sprite4.sorting_in_layer = 1;
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index f3d2387..62b7d33 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -1,3 +1,4 @@
+#include "types.h"
 #include <crepe/ComponentManager.h>
 #include <crepe/api/GameObject.h>
 #include <crepe/api/Metadata.h>
@@ -12,10 +13,8 @@ using namespace crepe;
 
 class ConcreteScene1 : public Scene {
 public:
-	using Scene::Scene;
-
 	void load_scene() {
-		auto & mgr = this->component_manager;
+		ComponentManager & mgr = this->component_manager;
 		GameObject object1 = mgr.new_object("scene_1", "tag_scene_1", vec2{0, 0}, 0, 1);
 		GameObject object2 = mgr.new_object("scene_1", "tag_scene_1", vec2{1, 0}, 0, 1);
 		GameObject object3 = mgr.new_object("scene_1", "tag_scene_1", vec2{2, 0}, 0, 1);
@@ -26,10 +25,8 @@ public:
 
 class ConcreteScene2 : public Scene {
 public:
-	using Scene::Scene;
-
 	void load_scene() {
-		auto & mgr = this->component_manager;
+		ComponentManager & mgr = this->component_manager;
 		GameObject object1 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 0}, 0, 1);
 		GameObject object2 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 1}, 0, 1);
 		GameObject object3 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 2}, 0, 1);
@@ -39,6 +36,21 @@ public:
 	string get_name() const { return "scene2"; }
 };
 
+class ConcreteScene3 : public Scene {
+public:
+	ConcreteScene3(const string & name) : name(name) {}
+
+	void load_scene() {
+		ComponentManager & mgr = this->component_manager;
+		GameObject object1 = mgr.new_object("scene_3", "tag_scene_3", vec2{0, 0}, 0, 1);
+	}
+
+	string get_name() const { return name; }
+
+private:
+	const string name;
+};
+
 class SceneManagerTest : public ::testing::Test {
 public:
 	ComponentManager component_mgr{};
@@ -124,3 +136,25 @@ TEST_F(SceneManagerTest, loadScene) {
 	EXPECT_EQ(transform[3].get().position.x, 0);
 	EXPECT_EQ(transform[3].get().position.y, 3);
 }
+
+TEST_F(SceneManagerTest, perfectForwarding) {
+	scene_mgr.add_scene<ConcreteScene3>("scene3");
+
+	scene_mgr.load_next_scene();
+
+	vector<reference_wrapper<Metadata>> metadata
+		= component_mgr.get_components_by_type<Metadata>();
+	vector<reference_wrapper<Transform>> transform
+		= component_mgr.get_components_by_type<Transform>();
+
+	EXPECT_EQ(metadata.size(), 1);
+	EXPECT_EQ(transform.size(), 1);
+
+	EXPECT_EQ(metadata[0].get().game_object_id, 0);
+	EXPECT_EQ(metadata[0].get().name, "scene_3");
+	EXPECT_EQ(metadata[0].get().tag, "tag_scene_3");
+	EXPECT_EQ(metadata[0].get().parent, -1);
+	EXPECT_EQ(metadata[0].get().children.size(), 0);
+	EXPECT_EQ(transform[0].get().position.x, 0);
+	EXPECT_EQ(transform[0].get().position.y, 0);
+}
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 19a8d6e..e03a989 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -1,16 +1,21 @@
-#include <crepe/api/Config.h>
-
 #include <gtest/gtest.h>
 
+#define protected public
+#define private public
+
+#include <crepe/api/Config.h>
+
 using namespace crepe;
 using namespace testing;
 
 class GlobalConfigReset : public EmptyTestEventListener {
 public:
 	Config & cfg = Config::get_instance();
+	Config cfg_default = Config();
 
 	// This function is called before each test
 	void OnTestStart(const TestInfo &) override {
+		cfg = cfg_default;
 		cfg.log.level = Log::Level::WARNING;
 	}
 };