From 0e4f5a6870fb5cd9ea341dd5993feb1d74388ac7 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 6 Nov 2023 08:55:32 +0100 Subject: [PATCH] test: use shared empty type --- test/entt/entity/registry.cpp | 103 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp index d81c34743..553a15201 100644 --- a/test/entt/entity/registry.cpp +++ b/test/entt/entity/registry.cpp @@ -15,11 +15,10 @@ #include #include "../common/aggregate.h" #include "../common/config.h" +#include "../common/empty.h" #include "../common/non_default_constructible.h" #include "../common/pointer_stable.h" -struct empty_type {}; - struct no_eto_type { static constexpr std::size_t page_size = 1024u; }; @@ -527,12 +526,12 @@ TEST(Registry, CreateManyEntitiesAtOnceWithListener) { ASSERT_EQ(listener.counter, 3); registry.on_construct().disconnect<&listener::incr>(listener); - registry.on_construct().connect<&listener::incr>(listener); + registry.on_construct().connect<&listener::incr>(listener); registry.create(std::begin(entity), std::end(entity)); registry.insert(std::begin(entity), std::end(entity), 'a'); - registry.insert(std::begin(entity), std::end(entity)); + registry.insert(std::begin(entity), std::end(entity)); - ASSERT_TRUE(registry.all_of(entity[0])); + ASSERT_TRUE(registry.all_of(entity[0])); ASSERT_EQ(registry.get(entity[2]), 'a'); ASSERT_EQ(listener.counter, 6); } @@ -1220,17 +1219,17 @@ TEST(Registry, SortMulti) { TEST(Registry, SortEmpty) { entt::registry registry; - registry.emplace(registry.create()); - registry.emplace(registry.create()); - registry.emplace(registry.create()); + registry.emplace(registry.create()); + registry.emplace(registry.create()); + registry.emplace(registry.create()); - ASSERT_LT(registry.storage().data()[0], registry.storage().data()[1]); - ASSERT_LT(registry.storage().data()[1], registry.storage().data()[2]); + ASSERT_LT(registry.storage().data()[0], registry.storage().data()[1]); + ASSERT_LT(registry.storage().data()[1], registry.storage().data()[2]); - registry.sort(std::less{}); + registry.sort(std::less{}); - ASSERT_GT(registry.storage().data()[0], registry.storage().data()[1]); - ASSERT_GT(registry.storage().data()[1], registry.storage().data()[2]); + ASSERT_GT(registry.storage().data()[0], registry.storage().data()[1]); + ASSERT_GT(registry.storage().data()[1], registry.storage().data()[2]); } TEST(Registry, ComponentsWithTypesFromStandardTemplateLibrary) { @@ -1253,13 +1252,13 @@ TEST(Registry, Signals) { entt::entity entity[2u]; listener listener; - registry.on_construct().connect<&listener::incr>(listener); - registry.on_destroy().connect<&listener::decr>(listener); + registry.on_construct().connect<&listener::incr>(listener); + registry.on_destroy().connect<&listener::decr>(listener); registry.on_construct().connect<&listener::incr>(listener); registry.on_destroy().connect<&listener::decr>(listener); registry.create(std::begin(entity), std::end(entity)); - registry.insert(std::begin(entity), std::end(entity)); + registry.insert(std::begin(entity), std::end(entity)); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[1u]); @@ -1269,23 +1268,23 @@ TEST(Registry, Signals) { ASSERT_EQ(listener.counter, 4); ASSERT_EQ(listener.last, entity[0u]); - registry.erase(entity[0u]); + registry.erase(entity[0u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[0u]); - registry.on_destroy().disconnect<&listener::decr>(listener); + registry.on_destroy().disconnect<&listener::decr>(listener); registry.on_destroy().disconnect<&listener::decr>(listener); - registry.erase(entity[1u]); + registry.erase(entity[1u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[0u]); - registry.on_construct().disconnect<&listener::incr>(listener); + registry.on_construct().disconnect<&listener::incr>(listener); registry.on_construct().disconnect<&listener::incr>(listener); - registry.emplace(entity[1u]); + registry.emplace(entity[1u]); registry.emplace(entity[1u]); ASSERT_EQ(listener.counter, 2); @@ -1300,53 +1299,53 @@ TEST(Registry, Signals) { ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[1u]); - registry.on_construct().connect<&listener::incr>(listener); - registry.on_destroy().connect<&listener::decr>(listener); + registry.on_construct().connect<&listener::incr>(listener); + registry.on_destroy().connect<&listener::decr>(listener); - registry.erase(entity[1u]); - registry.emplace(entity[0u]); + registry.erase(entity[1u]); + registry.emplace(entity[0u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[0u]); - registry.clear(); + registry.clear(); ASSERT_EQ(listener.counter, 0); ASSERT_EQ(listener.last, entity[0u]); - registry.insert(std::begin(entity), std::end(entity)); + registry.insert(std::begin(entity), std::end(entity)); registry.insert(std::begin(entity), std::end(entity)); registry.destroy(entity[1u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[1u]); - registry.erase(entity[0u]); + registry.erase(entity[0u]); registry.emplace_or_replace(entity[0u]); - registry.emplace_or_replace(entity[0u]); + registry.emplace_or_replace(entity[0u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[0u]); - registry.on_destroy().disconnect<&listener::decr>(listener); + registry.on_destroy().disconnect<&listener::decr>(listener); registry.on_destroy().disconnect<&listener::decr>(listener); - registry.emplace_or_replace(entity[0u]); + registry.emplace_or_replace(entity[0u]); registry.emplace_or_replace(entity[0u]); ASSERT_EQ(listener.counter, 2); ASSERT_EQ(listener.last, entity[0u]); - registry.on_update().connect<&listener::incr>(listener); + registry.on_update().connect<&listener::incr>(listener); registry.on_update().connect<&listener::incr>(listener); - registry.emplace_or_replace(entity[0u]); + registry.emplace_or_replace(entity[0u]); registry.emplace_or_replace(entity[0u]); ASSERT_EQ(listener.counter, 4); ASSERT_EQ(listener.last, entity[0u]); - registry.replace(entity[0u]); + registry.replace(entity[0u]); registry.replace(entity[0u]); ASSERT_EQ(listener.counter, 6); @@ -1889,9 +1888,9 @@ TEST(Registry, GetOrEmplace) { const auto entity = registry.create(); const auto value = registry.get_or_emplace(entity, 3); // get_or_emplace must work for empty types - static_cast(registry.get_or_emplace(entity)); + static_cast(registry.get_or_emplace(entity)); - ASSERT_TRUE((registry.all_of(entity))); + ASSERT_TRUE((registry.all_of(entity))); ASSERT_EQ(registry.get(entity), value); ASSERT_EQ(registry.get(entity), 3); } @@ -1917,7 +1916,7 @@ TEST(Registry, Constness) { entt::registry registry; testing::StaticAssertTypeEq({})), int &>(); - testing::StaticAssertTypeEq({})), void>(); + testing::StaticAssertTypeEq({})), void>(); testing::StaticAssertTypeEq({})), std::tuple<>>(); testing::StaticAssertTypeEq({})), int &>(); @@ -2045,49 +2044,49 @@ TEST(Registry, RuntimePools) { using namespace entt::literals; entt::registry registry; - auto &storage = registry.storage("other"_hs); + auto &storage = registry.storage("other"_hs); const auto entity = registry.create(); - testing::StaticAssertTypeEq()), entt::storage_type_t &>(); - testing::StaticAssertTypeEq()), const entt::storage_type_t *>(); + testing::StaticAssertTypeEq()), entt::storage_type_t &>(); + testing::StaticAssertTypeEq()), const entt::storage_type_t *>(); - testing::StaticAssertTypeEq::base_type *>(); - testing::StaticAssertTypeEq::base_type *>(); + testing::StaticAssertTypeEq::base_type *>(); + testing::StaticAssertTypeEq::base_type *>(); ASSERT_NE(registry.storage("other"_hs), nullptr); ASSERT_EQ(std::as_const(registry).storage("rehto"_hs), nullptr); - ASSERT_EQ(®istry.storage("other"_hs), &storage); - ASSERT_NE(std::as_const(registry).storage(), &storage); + ASSERT_EQ(®istry.storage("other"_hs), &storage); + ASSERT_NE(std::as_const(registry).storage(), &storage); - ASSERT_FALSE(registry.any_of(entity)); + ASSERT_FALSE(registry.any_of(entity)); ASSERT_FALSE(storage.contains(entity)); - registry.emplace(entity); + registry.emplace(entity); ASSERT_FALSE(storage.contains(entity)); - ASSERT_TRUE(registry.any_of(entity)); - ASSERT_EQ((entt::basic_view{registry.storage(), storage}.size_hint()), 0u); + ASSERT_TRUE(registry.any_of(entity)); + ASSERT_EQ((entt::basic_view{registry.storage(), storage}.size_hint()), 0u); storage.emplace(entity); ASSERT_TRUE(storage.contains(entity)); - ASSERT_TRUE(registry.any_of(entity)); - ASSERT_EQ((entt::basic_view{registry.storage(), storage}.size_hint()), 1u); + ASSERT_TRUE(registry.any_of(entity)); + ASSERT_EQ((entt::basic_view{registry.storage(), storage}.size_hint()), 1u); registry.destroy(entity); ASSERT_EQ(registry.create(entity), entity); ASSERT_FALSE(storage.contains(entity)); - ASSERT_FALSE(registry.any_of(entity)); + ASSERT_FALSE(registry.any_of(entity)); } ENTT_DEBUG_TEST(RegistryDeathTest, RuntimePools) { using namespace entt::literals; entt::registry registry; - registry.storage("other"_hs); + registry.storage("other"_hs); ASSERT_DEATH(registry.storage("other"_hs), ""); ASSERT_DEATH(std::as_const(registry).storage("other"_hs), "");