test: more on entity traits

test/entt/entity/entity.cpp

@@ -1,20 +1,44 @@
 #include <gtest/gtest.h>
 #include <entt/entity/entity.hpp>
 #include <entt/entity/registry.hpp>
+#include "../common/custom_entity.h"
 
-TEST(Entity, Traits) {
-    using traits_type = entt::entt_traits<entt::entity>;
-    constexpr entt::entity tombstone = entt::tombstone;
-    constexpr entt::entity null = entt::null;
-    entt::registry registry{};
+struct custom_entity_traits {
+    using value_type = test::custom_entity;
+    using entity_type = std::uint32_t;
+    using version_type = std::uint16_t;
+    static constexpr entity_type entity_mask = 0x3FFFF; // 18b
+    static constexpr entity_type version_mask = 0x3FFF; // 14b
+};
+
+template<>
+struct entt::entt_traits<test::custom_entity>: entt::basic_entt_traits<custom_entity_traits> {
+    static constexpr std::size_t page_size = ENTT_SPARSE_PAGE;
+};
+
+template<typename Type>
+struct Entity: testing::Test {
+    using type = Type;
+};
+
+using EntityTypes = ::testing::Types<entt::entity, test::custom_entity>;
+
+TYPED_TEST_SUITE(Entity, EntityTypes, );
+
+TYPED_TEST(Entity, Traits) {
+    using entity_type = typename TestFixture::type;
+    using traits_type = entt::entt_traits<entity_type>;
+    constexpr entity_type tombstone = entt::tombstone;
+    constexpr entity_type null = entt::null;
+    entt::basic_registry<entity_type> registry{};
 
     registry.destroy(registry.create());
     const auto entity = registry.create();
     const auto other = registry.create();
 
     ASSERT_EQ(entt::to_integral(entity), entt::to_integral(entity));
-    ASSERT_NE(entt::to_integral(entity), entt::to_integral<entt::entity>(entt::null));
-    ASSERT_NE(entt::to_integral(entity), entt::to_integral(entt::entity{}));
+    ASSERT_NE(entt::to_integral(entity), entt::to_integral<entity_type>(entt::null));
+    ASSERT_NE(entt::to_integral(entity), entt::to_integral(entity_type{}));
 
     ASSERT_EQ(entt::to_entity(entity), 0u);
     ASSERT_EQ(entt::to_version(entity), 1u);
@@ -37,15 +61,16 @@ TEST(Entity, Traits) {
     ASSERT_EQ(traits_type::next(entt::null), traits_type::construct(entt::null, {}));
 }
 
-TEST(Entity, Null) {
-    using traits_type = entt::entt_traits<entt::entity>;
-    constexpr entt::entity null = entt::null;
+TYPED_TEST(Entity, Null) {
+    using entity_type = typename TestFixture::type;
+    using traits_type = entt::entt_traits<entity_type>;
+    constexpr entity_type null = entt::null;
 
-    ASSERT_FALSE(entt::entity{} == entt::null);
+    ASSERT_FALSE(entity_type{} == entt::null);
     ASSERT_TRUE(entt::null == entt::null);
     ASSERT_FALSE(entt::null != entt::null);
 
-    entt::registry registry{};
+    entt::basic_registry<entity_type> registry{};
     const auto entity = registry.create();
 
     ASSERT_EQ(traits_type::combine(entt::null, entt::to_integral(entity)), (traits_type::construct(entt::to_entity(null), entt::to_version(entity))));
@@ -60,21 +85,22 @@ TEST(Entity, Null) {
     ASSERT_TRUE(entity != entt::null);
     ASSERT_TRUE(entt::null != entity);
 
-    const entt::entity other = entt::null;
+    const entity_type other = entt::null;
 
     ASSERT_FALSE(registry.valid(other));
     ASSERT_NE(registry.create(other), other);
 }
 
-TEST(Entity, Tombstone) {
-    using traits_type = entt::entt_traits<entt::entity>;
-    constexpr entt::entity tombstone = entt::tombstone;
+TYPED_TEST(Entity, Tombstone) {
+    using entity_type = typename TestFixture::type;
+    using traits_type = entt::entt_traits<entity_type>;
+    constexpr entity_type tombstone = entt::tombstone;
 
-    ASSERT_FALSE(entt::entity{} == entt::tombstone);
+    ASSERT_FALSE(entity_type{} == entt::tombstone);
     ASSERT_TRUE(entt::tombstone == entt::tombstone);
     ASSERT_FALSE(entt::tombstone != entt::tombstone);
 
-    entt::registry registry{};
+    entt::basic_registry<entity_type> registry{};
     const auto entity = registry.create();
 
     ASSERT_EQ(traits_type::combine(entt::to_integral(entity), entt::tombstone), (traits_type::construct(entt::to_entity(entity), entt::to_version(tombstone))));