From e33d8b28ca448468ffc8afcc9c95f21047cba04d Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Mon, 26 Feb 2024 09:16:44 +0100 Subject: [PATCH] test: more entity types --- test/common/custom_entity.h | 12 ------------ test/common/entity.h | 13 +++++++++++++ test/entt/entity/entity.cpp | 10 +++++----- test/entt/entity/registry.cpp | 12 ++++++------ test/entt/entity/sigh_mixin.cpp | 16 ++++++++-------- test/entt/entity/sparse_set.cpp | 10 +++++----- 6 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 test/common/custom_entity.h create mode 100644 test/common/entity.h diff --git a/test/common/custom_entity.h b/test/common/custom_entity.h deleted file mode 100644 index 14689c2ac..000000000 --- a/test/common/custom_entity.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef ENTT_COMMON_CUSTOM_ENTITY_H -#define ENTT_COMMON_CUSTOM_ENTITY_H - -#include - -namespace test { - -enum custom_entity : std::uint32_t {}; - -} // namespace test - -#endif diff --git a/test/common/entity.h b/test/common/entity.h new file mode 100644 index 000000000..8fab610e5 --- /dev/null +++ b/test/common/entity.h @@ -0,0 +1,13 @@ +#ifndef ENTT_COMMON_ENTITY_H +#define ENTT_COMMON_ENTITY_H + +#include + +namespace test { + +enum entity : std::uint32_t {}; +enum other_entity : std::uint32_t {}; + +} // namespace test + +#endif diff --git a/test/entt/entity/entity.cpp b/test/entt/entity/entity.cpp index 8e3796595..ef63cf319 100644 --- a/test/entt/entity/entity.cpp +++ b/test/entt/entity/entity.cpp @@ -1,12 +1,12 @@ #include #include #include -#include +#include #include #include -struct custom_entity_traits { - using value_type = test::custom_entity; +struct entity_traits { + using value_type = test::entity; using entity_type = std::uint32_t; using version_type = std::uint16_t; static constexpr entity_type entity_mask = 0x3FFFF; // 18b @@ -14,7 +14,7 @@ struct custom_entity_traits { }; template<> -struct entt::entt_traits: entt::basic_entt_traits { +struct entt::entt_traits: entt::basic_entt_traits { static constexpr std::size_t page_size = ENTT_SPARSE_PAGE; }; @@ -23,7 +23,7 @@ struct Entity: testing::Test { using type = Type; }; -using EntityTypes = ::testing::Types; +using EntityTypes = ::testing::Types; TYPED_TEST_SUITE(Entity, EntityTypes, ); diff --git a/test/entt/entity/registry.cpp b/test/entt/entity/registry.cpp index c415ac755..be79d658a 100644 --- a/test/entt/entity/registry.cpp +++ b/test/entt/entity/registry.cpp @@ -11,8 +11,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -79,8 +79,8 @@ private: bool *ctx_check{}; }; -struct custom_entity_traits { - using value_type = test::custom_entity; +struct entity_traits { + using value_type = test::entity; using entity_type = uint32_t; using version_type = uint16_t; static constexpr entity_type entity_mask = 0xFF; @@ -88,7 +88,7 @@ struct custom_entity_traits { }; template<> -struct entt::entt_traits: entt::basic_entt_traits { +struct entt::entt_traits: entt::basic_entt_traits { static constexpr auto page_size = ENTT_SPARSE_PAGE; }; @@ -758,8 +758,8 @@ TEST(Registry, CreateDestroyReleaseCornerCase) { } ENTT_DEBUG_TEST(RegistryDeathTest, CreateTooManyEntities) { - entt::basic_registry registry{}; - std::vector entity(entt::entt_traits::to_entity(entt::null)); + entt::basic_registry registry{}; + std::vector entity(entt::entt_traits::to_entity(entt::null)); registry.create(entity.begin(), entity.end()); ASSERT_DEATH([[maybe_unused]] const auto entt = registry.create(), ""); diff --git a/test/entt/entity/sigh_mixin.cpp b/test/entt/entity/sigh_mixin.cpp index 06f7c7d21..515e9b97c 100644 --- a/test/entt/entity/sigh_mixin.cpp +++ b/test/entt/entity/sigh_mixin.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include #include @@ -24,11 +24,11 @@ void listener(std::size_t &counter, Registry &, typename Registry::entity_type) ++counter; } -struct custom_registry: entt::basic_registry {}; +struct custom_registry: entt::basic_registry {}; template -struct entt::storage_type, std::enable_if_t>> { - using type = entt::basic_sigh_mixin, custom_registry>; +struct entt::storage_type, std::enable_if_t>> { + using type = entt::basic_sigh_mixin, custom_registry>; }; template @@ -436,18 +436,18 @@ TYPED_TEST(SighMixin, Swap) { TYPED_TEST(SighMixin, CustomRegistry) { using value_type = typename TestFixture::type; - entt::basic_sigh_mixin, custom_registry> pool; + entt::basic_sigh_mixin, custom_registry> pool; custom_registry registry; std::size_t on_construct{}; std::size_t on_destroy{}; - pool.bind(entt::forward_as_any(static_cast &>(registry))); + pool.bind(entt::forward_as_any(static_cast &>(registry))); pool.on_construct().template connect<&listener>(on_construct); pool.on_destroy().template connect<&listener>(on_destroy); - pool.emplace(test::custom_entity{3}); - pool.emplace(test::custom_entity{1}); + pool.emplace(test::entity{3}); + pool.emplace(test::entity{1}); ASSERT_EQ(on_construct, 2u); ASSERT_EQ(on_destroy, 0u); diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp index 8a33f7e10..60d8cff3e 100644 --- a/test/entt/entity/sparse_set.cpp +++ b/test/entt/entity/sparse_set.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -16,8 +16,8 @@ #include #include -struct custom_entity_traits { - using value_type = test::custom_entity; +struct entity_traits { + using value_type = test::entity; using entity_type = std::uint32_t; using version_type = std::uint16_t; static constexpr entity_type entity_mask = 0x3FFFF; // 18b @@ -25,7 +25,7 @@ struct custom_entity_traits { }; template<> -struct entt::entt_traits: entt::basic_entt_traits { +struct entt::entt_traits: entt::basic_entt_traits { static constexpr std::size_t page_size = ENTT_SPARSE_PAGE; }; @@ -43,7 +43,7 @@ struct SparseSet: testing::Test { template using SparseSetDeathTest = SparseSet; -using SparseSetTypes = ::testing::Types; +using SparseSetTypes = ::testing::Types; TYPED_TEST_SUITE(SparseSet, SparseSetTypes, ); TYPED_TEST_SUITE(SparseSetDeathTest, SparseSetTypes, );