From 148efb02cc299771644dbdf349f05c7db2d8206e Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 9 Jan 2023 20:49:56 +0300 Subject: [PATCH] Fix ecs tests --- libs/util/tests/ecs.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libs/util/tests/ecs.cpp b/libs/util/tests/ecs.cpp index dc558bd1..10863831 100644 --- a/libs/util/tests/ecs.cpp +++ b/libs/util/tests/ecs.cpp @@ -78,19 +78,21 @@ test_case(util_ecs_species__impl_sparse_component) { using namespace psemek::util::ecs_detail; - sparse_species_impl species("species 1", 0, test_component_1{10}); + psemek::util::ecs ecs; + + sparse_species_impl species(&ecs, "species 1", 0, test_component_1{10}); expect_different_ptr(species.get_species_component(), nullptr); expect_equal(species.get_species_component()->species_value_1, 10); expect_equal_ptr(species.get_species_component(), nullptr); - sparse_species_impl species_2("species 2", 1, test_component_2{20}); + sparse_species_impl species_2(&ecs, "species 2", 1, test_component_2{20}); expect_equal_ptr(species_2.get_species_component(), nullptr); expect_different_ptr(species_2.get_species_component(), nullptr); expect_equal(species_2.get_species_component()->species_value_2, 20); - sparse_species_impl species_12("species 12", 2, test_component_1{100}, test_component_2{200}); + sparse_species_impl species_12(&ecs, "species 12", 2, test_component_1{100}, test_component_2{200}); expect_different_ptr(species_12.get_species_component(), nullptr); expect_equal(species_12.get_species_component()->species_value_1, 100); @@ -102,19 +104,21 @@ test_case(util_ecs_species__impl_packed_component) { using namespace psemek::util::ecs_detail; - packed_species_impl species("species 1", 0, test_component_1{10}); + psemek::util::ecs ecs; + + packed_species_impl species(&ecs, "species 1", 0, test_component_1{10}); expect_different_ptr(species.get_species_component(), nullptr); expect_equal(species.get_species_component()->species_value_1, 10); expect_equal_ptr(species.get_species_component(), nullptr); - packed_species_impl species_2("species 2", 1, test_component_2{20}); + packed_species_impl species_2(&ecs, "species 2", 1, test_component_2{20}); expect_equal_ptr(species_2.get_species_component(), nullptr); expect_different_ptr(species_2.get_species_component(), nullptr); expect_equal(species_2.get_species_component()->species_value_2, 20); - packed_species_impl species_12("species 12", 2, test_component_1{100}, test_component_2{200}); + packed_species_impl species_12(&ecs, "species 12", 2, test_component_1{100}, test_component_2{200}); expect_different_ptr(species_12.get_species_component(), nullptr); expect_equal(species_12.get_species_component()->species_value_1, 100); @@ -126,7 +130,9 @@ test_case(util_ecs_species__impl_sparse_entity) { using namespace psemek::util::ecs_detail; - sparse_species_impl species("species", 0, test_component_1{10}); + psemek::util::ecs ecs; + + sparse_species_impl species(&ecs, "species", 0, test_component_1{10}); expect_equal(species.entity_count(), 0); @@ -161,7 +167,9 @@ test_case(util_ecs_species__impl_packed_entity) { using namespace psemek::util::ecs_detail; - packed_species_impl species("species", 0, test_component_1{10}); + psemek::util::ecs ecs; + + packed_species_impl species(&ecs, "species", 0, test_component_1{10}); expect_equal(species.entity_count(), 0);