test: minor changes

test/entt/entity/component.cpp

@@ -30,50 +30,50 @@ struct entt::component_traits<traits_based> {
 };
 
 TEST(Component, VoidType) {
-    using traits = entt::component_traits<void>;
+    using traits_type = entt::component_traits<void>;
 
-    static_assert(traits::in_place_delete);
-    static_assert(entt::ignore_as_empty_v<typename traits::type>);
+    static_assert(traits_type::in_place_delete);
+    static_assert(entt::ignore_as_empty_v<typename traits_type::type>);
     // we don't really care about this thanks to ignore_as_empty_v
-    static_assert(traits::page_size != 0u);
+    static_assert(traits_type::page_size != 0u);
 }
 
 TEST(Component, Empty) {
-    using traits = entt::component_traits<empty>;
+    using traits_type = entt::component_traits<empty>;
 
-    static_assert(!traits::in_place_delete);
-    static_assert(entt::ignore_as_empty_v<typename traits::type>);
-    static_assert(traits::page_size == 0u);
+    static_assert(!traits_type::in_place_delete);
+    static_assert(entt::ignore_as_empty_v<typename traits_type::type>);
+    static_assert(traits_type::page_size == 0u);
 }
 
 TEST(Component, NonEmpty) {
-    using traits = entt::component_traits<non_empty>;
+    using traits_type = entt::component_traits<non_empty>;
 
-    static_assert(!traits::in_place_delete);
-    static_assert(!entt::ignore_as_empty_v<typename traits::type>);
-    static_assert(traits::page_size == ENTT_PACKED_PAGE);
+    static_assert(!traits_type::in_place_delete);
+    static_assert(!entt::ignore_as_empty_v<typename traits_type::type>);
+    static_assert(traits_type::page_size == ENTT_PACKED_PAGE);
 }
 
 TEST(Component, NonMovable) {
-    using traits = entt::component_traits<non_movable>;
+    using traits_type = entt::component_traits<non_movable>;
 
-    static_assert(traits::in_place_delete);
-    static_assert(!entt::ignore_as_empty_v<typename traits::type>);
-    static_assert(traits::page_size == ENTT_PACKED_PAGE);
+    static_assert(traits_type::in_place_delete);
+    static_assert(!entt::ignore_as_empty_v<typename traits_type::type>);
+    static_assert(traits_type::page_size == ENTT_PACKED_PAGE);
 }
 
 TEST(Component, SelfContained) {
-    using traits = entt::component_traits<self_contained>;
+    using traits_type = entt::component_traits<self_contained>;
 
-    static_assert(traits::in_place_delete);
-    static_assert(!entt::ignore_as_empty_v<typename traits::type>);
-    static_assert(traits::page_size == 4u);
+    static_assert(traits_type::in_place_delete);
+    static_assert(!entt::ignore_as_empty_v<typename traits_type::type>);
+    static_assert(traits_type::page_size == 4u);
 }
 
 TEST(Component, TraitsBased) {
-    using traits = entt::component_traits<traits_based>;
+    using traits_type = entt::component_traits<traits_based>;
 
-    static_assert(!traits::in_place_delete);
-    static_assert(!entt::ignore_as_empty_v<typename traits::type>);
-    static_assert(traits::page_size == 8u);
+    static_assert(!traits_type::in_place_delete);
+    static_assert(!entt::ignore_as_empty_v<typename traits_type::type>);
+    static_assert(traits_type::page_size == 8u);
 }

test/entt/entity/helper.cpp

@@ -52,7 +52,7 @@ TEST(Helper, Invoke) {
 TEST(Helper, ToEntity) {
     entt::registry registry;
     const entt::entity null = entt::null;
-    constexpr auto page_size = entt::component_traits<int>::page_size;
+    constexpr auto page_size = entt::storage_for_t<int>::traits_type::page_size;
     const int value = 42;
 
     ASSERT_EQ(entt::to_entity(registry, 42), null);
@@ -92,7 +92,7 @@ TEST(Helper, ToEntity) {
 TEST(Helper, ToEntityStableType) {
     entt::registry registry;
     const entt::entity null = entt::null;
-    constexpr auto page_size = entt::component_traits<stable_type>::page_size;
+    constexpr auto page_size = entt::storage_for_t<stable_type>::traits_type::page_size;
     const stable_type value{42};
 
     ASSERT_EQ(entt::to_entity(registry, stable_type{42}), null);

test/entt/entity/storage.cpp

@@ -92,7 +92,7 @@ inline bool operator==(const boxed_int &lhs, const boxed_int &rhs) {
 
 TEST(Storage, Functionalities) {
     entt::storage<int> pool;
-    constexpr auto page_size = entt::component_traits<int>::page_size;
+    constexpr auto page_size = decltype(pool)::traits_type::page_size;
 
     ASSERT_NO_FATAL_FAILURE([[maybe_unused]] auto alloc = pool.get_allocator());
     ASSERT_EQ(pool.type(), entt::type_id<int>());
@@ -865,7 +865,7 @@ TEST(Storage, Compact) {
 
 TEST(Storage, ShrinkToFit) {
     entt::storage<int> pool;
-    constexpr auto page_size = entt::component_traits<int>::page_size;
+    constexpr auto page_size = decltype(pool)::traits_type::page_size;
 
     for(std::size_t next{}; next < page_size; ++next) {
         pool.emplace(entt::entity(next));
@@ -1201,7 +1201,7 @@ TEST(Storage, IteratorConversion) {
 
 TEST(Storage, IteratorPageSizeAwareness) {
     entt::storage<std::unordered_set<char>> pool;
-    constexpr auto page_size = entt::component_traits<std::unordered_set<char>>::page_size;
+    constexpr auto page_size = decltype(pool)::traits_type::page_size;
     const std::unordered_set<char> check{'c'};
 
     for(unsigned int next{}; next < page_size; ++next) {
@@ -1608,7 +1608,7 @@ TEST(Storage, RespectUnordered) {
 TEST(Storage, CanModifyDuringIteration) {
     entt::storage<int> pool;
     auto *ptr = &pool.emplace(entt::entity{0}, 42);
-    constexpr auto page_size = entt::component_traits<int>::page_size;
+    constexpr auto page_size = decltype(pool)::traits_type::page_size;
 
     ASSERT_EQ(pool.capacity(), page_size);
 
@@ -1772,8 +1772,8 @@ TEST(Storage, ThrowingAllocator) {
         using value_type = typename decltype(pool)::value_type;
 
         typename std::decay_t<decltype(pool)>::base_type &base = pool;
-        constexpr auto packed_page_size = entt::component_traits<typename decltype(pool)::value_type>::page_size;
-        constexpr auto sparse_page_size = entt::entt_traits<typename decltype(pool)::entity_type>::page_size;
+        constexpr auto packed_page_size = decltype(pool)::traits_type::page_size;
+        constexpr auto sparse_page_size = std::remove_reference_t<decltype(base)>::traits_type::page_size;
 
         pool_allocator_type::trigger_on_allocate = true;