1 files changed, 48 insertions, 2 deletions

diff --git a/src/test/ECSTest.cpp b/src/test/ECSTest.cpp
index a169b3b..ed5341e 100644
--- a/src/test/ECSTest.cpp
+++ b/src/test/ECSTest.cpp
@@ -17,6 +17,10 @@ class ECSTest : public ::testing::Test {
 
 public:
 	ComponentManager mgr{m};
+
+	class TestComponent : public Component {
+		using Component::Component;
+	};
 };
 
 TEST_F(ECSTest, createGameObject) {
@@ -389,7 +393,7 @@ TEST_F(ECSTest, resetPersistent) {
 	EXPECT_EQ(transform.size(), 0);
 }
 
-TEST_F(ECSTest, GetByName) {
+TEST_F(ECSTest, IDByName) {
 	GameObject foo = mgr.new_object("foo");
 	GameObject bar = mgr.new_object("bar");
 
@@ -405,7 +409,7 @@ TEST_F(ECSTest, GetByName) {
 	}
 }
 
-TEST_F(ECSTest, GetByTag) {
+TEST_F(ECSTest, IDByTag) {
 	GameObject foo = mgr.new_object("foo", "common tag");
 	GameObject bar = mgr.new_object("bar", "common tag");
 
@@ -421,3 +425,45 @@ TEST_F(ECSTest, GetByTag) {
 		EXPECT_TRUE(objects.contains(bar.id));
 	}
 }
+
+TEST_F(ECSTest, ComponentsByName) {
+	GameObject foo = mgr.new_object("foo");
+	foo.add_component<TestComponent>();
+	GameObject bar = mgr.new_object("bar");
+	bar.add_component<TestComponent>();
+	bar.add_component<TestComponent>();
+
+	{
+		auto objects = mgr.get_components_by_name<TestComponent>("");
+		EXPECT_EQ(objects.size(), 0);
+	}
+
+	{
+		auto objects = mgr.get_components_by_name<TestComponent>("foo");
+		EXPECT_EQ(objects.size(), 1);
+	}
+
+	{
+		auto objects = mgr.get_components_by_name<TestComponent>("bar");
+		EXPECT_EQ(objects.size(), 2);
+	}
+}
+
+TEST_F(ECSTest, ComponentsByTag) {
+	GameObject foo = mgr.new_object("foo", "common tag");
+	foo.add_component<TestComponent>();
+	GameObject bar = mgr.new_object("bar", "common tag");
+	bar.add_component<TestComponent>();
+	bar.add_component<TestComponent>();
+
+	{
+		auto objects = mgr.get_components_by_tag<TestComponent>("");
+		EXPECT_EQ(objects.size(), 0);
+	}
+
+	{
+		auto objects = mgr.get_components_by_tag<TestComponent>("common tag");
+		EXPECT_EQ(objects.size(), 3);
+	}
+}
+