1
0
Michele Caini 3 жил өмнө
parent
commit
3885d280d3

+ 0 - 3
test/entt/meta/meta_any.cpp

@@ -78,9 +78,6 @@ struct MetaAny: ::testing::Test {
     void SetUp() override {
         using namespace entt::literals;
 
-        entt::meta<double>()
-            .type("double"_hs);
-
         entt::meta<empty_t>()
             .type("empty"_hs)
             .dtor<empty_t::destroy>();

+ 24 - 42
test/entt/meta/meta_container.cpp

@@ -15,25 +15,7 @@
 
 struct invalid_type {};
 
-struct MetaContainer: ::testing::Test {
-    void SetUp() override {
-        using namespace entt::literals;
-
-        entt::meta<double>()
-            .type("double"_hs);
-
-        entt::meta<int>()
-            .type("int"_hs);
-    }
-
-    void TearDown() override {
-        entt::meta_reset();
-    }
-};
-
-using MetaContainerDeathTest = MetaContainer;
-
-TEST_F(MetaContainer, InvalidContainer) {
+TEST(MetaContainer, InvalidContainer) {
     ASSERT_FALSE(entt::meta_any{42}.as_sequence_container());
     ASSERT_FALSE(entt::meta_any{42}.as_associative_container());
 
@@ -41,7 +23,7 @@ TEST_F(MetaContainer, InvalidContainer) {
     ASSERT_FALSE(entt::meta_any{std::vector<int>{}}.as_associative_container());
 }
 
-TEST_F(MetaContainer, EmptySequenceContainer) {
+TEST(MetaContainer, EmptySequenceContainer) {
     entt::meta_sequence_container container{};
 
     ASSERT_FALSE(container);
@@ -52,7 +34,7 @@ TEST_F(MetaContainer, EmptySequenceContainer) {
     ASSERT_TRUE(container);
 }
 
-TEST_F(MetaContainer, EmptyAssociativeContainer) {
+TEST(MetaContainer, EmptyAssociativeContainer) {
     entt::meta_associative_container container{};
 
     ASSERT_FALSE(container);
@@ -63,7 +45,7 @@ TEST_F(MetaContainer, EmptyAssociativeContainer) {
     ASSERT_TRUE(container);
 }
 
-TEST_F(MetaContainer, SequenceContainerIterator) {
+TEST(MetaContainer, SequenceContainerIterator) {
     std::vector<int> vec{2, 3, 4};
     auto any = entt::forward_as_meta(vec);
     entt::meta_sequence_container::iterator first{};
@@ -92,7 +74,7 @@ TEST_F(MetaContainer, SequenceContainerIterator) {
     ASSERT_EQ((--first)->cast<int>(), 2);
 }
 
-TEST_F(MetaContainer, AssociativeContainerIterator) {
+TEST(MetaContainer, AssociativeContainerIterator) {
     std::map<int, char> map{{2, 'c'}, {3, 'd'}, {4, 'e'}};
     auto any = entt::forward_as_meta(map);
     entt::meta_associative_container::iterator first{};
@@ -119,7 +101,7 @@ TEST_F(MetaContainer, AssociativeContainerIterator) {
     ASSERT_FALSE(first != last);
 }
 
-TEST_F(MetaContainer, StdVector) {
+TEST(MetaContainer, StdVector) {
     std::vector<int> vec{};
     auto any = entt::forward_as_meta(vec);
     auto view = any.as_sequence_container();
@@ -173,7 +155,7 @@ TEST_F(MetaContainer, StdVector) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, StdArray) {
+TEST(MetaContainer, StdArray) {
     std::array<int, 3> arr{};
     auto any = entt::forward_as_meta(arr);
     auto view = any.as_sequence_container();
@@ -214,7 +196,7 @@ TEST_F(MetaContainer, StdArray) {
     ASSERT_EQ(view.size(), 3u);
 }
 
-TEST_F(MetaContainer, StdList) {
+TEST(MetaContainer, StdList) {
     std::list<int> list{};
     auto any = entt::forward_as_meta(list);
     auto view = any.as_sequence_container();
@@ -268,7 +250,7 @@ TEST_F(MetaContainer, StdList) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, StdDeque) {
+TEST(MetaContainer, StdDeque) {
     std::deque<int> deque{};
     auto any = entt::forward_as_meta(deque);
     auto view = any.as_sequence_container();
@@ -322,7 +304,7 @@ TEST_F(MetaContainer, StdDeque) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, StdMap) {
+TEST(MetaContainer, StdMap) {
     std::map<int, char> map{{2, 'c'}, {3, 'd'}, {4, 'e'}};
     auto any = entt::forward_as_meta(map);
     auto view = any.as_associative_container();
@@ -365,7 +347,7 @@ TEST_F(MetaContainer, StdMap) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, StdSet) {
+TEST(MetaContainer, StdSet) {
     std::set<int> set{2, 3, 4};
     auto any = entt::forward_as_meta(set);
     auto view = any.as_associative_container();
@@ -407,7 +389,7 @@ TEST_F(MetaContainer, StdSet) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, DenseMap) {
+TEST(MetaContainer, DenseMap) {
     entt::dense_map<int, char> map{};
     auto any = entt::forward_as_meta(map);
     auto view = any.as_associative_container();
@@ -454,7 +436,7 @@ TEST_F(MetaContainer, DenseMap) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, DenseSet) {
+TEST(MetaContainer, DenseSet) {
     entt::dense_set<int> set{};
     auto any = entt::forward_as_meta(set);
     auto view = any.as_associative_container();
@@ -500,7 +482,7 @@ TEST_F(MetaContainer, DenseSet) {
     ASSERT_EQ(view.size(), 0u);
 }
 
-TEST_F(MetaContainer, ConstSequenceContainer) {
+TEST(MetaContainer, ConstSequenceContainer) {
     std::vector<int> vec{};
     auto any = entt::forward_as_meta(std::as_const(vec));
     auto view = any.as_sequence_container();
@@ -538,7 +520,7 @@ TEST_F(MetaContainer, ConstSequenceContainer) {
     ASSERT_EQ(view.size(), 1u);
 }
 
-ENTT_DEBUG_TEST_F(MetaContainerDeathTest, ConstSequenceContainer) {
+ENTT_DEBUG_TEST(MetaContainerDeathTest, ConstSequenceContainer) {
     std::vector<int> vec{};
     auto any = entt::forward_as_meta(std::as_const(vec));
     auto view = any.as_sequence_container();
@@ -547,7 +529,7 @@ ENTT_DEBUG_TEST_F(MetaContainerDeathTest, ConstSequenceContainer) {
     ASSERT_DEATH(view[0].cast<int &>() = 2, "");
 }
 
-TEST_F(MetaContainer, ConstKeyValueAssociativeContainer) {
+TEST(MetaContainer, ConstKeyValueAssociativeContainer) {
     std::map<int, char> map{};
     auto any = entt::forward_as_meta(std::as_const(map));
     auto view = any.as_associative_container();
@@ -580,7 +562,7 @@ TEST_F(MetaContainer, ConstKeyValueAssociativeContainer) {
     ASSERT_EQ(view.size(), 1u);
 }
 
-ENTT_DEBUG_TEST_F(MetaContainerDeathTest, ConstKeyValueAssociativeContainer) {
+ENTT_DEBUG_TEST(MetaContainerDeathTest, ConstKeyValueAssociativeContainer) {
     std::map<int, char> map{};
     auto any = entt::forward_as_meta(std::as_const(map));
     auto view = any.as_associative_container();
@@ -589,7 +571,7 @@ ENTT_DEBUG_TEST_F(MetaContainerDeathTest, ConstKeyValueAssociativeContainer) {
     ASSERT_DEATH(view.find(2)->second.cast<char &>() = 'a', "");
 }
 
-TEST_F(MetaContainer, ConstKeyOnlyAssociativeContainer) {
+TEST(MetaContainer, ConstKeyOnlyAssociativeContainer) {
     std::set<int> set{};
     auto any = entt::forward_as_meta(std::as_const(set));
     auto view = any.as_associative_container();
@@ -626,7 +608,7 @@ TEST_F(MetaContainer, ConstKeyOnlyAssociativeContainer) {
     ASSERT_EQ(view.size(), 1u);
 }
 
-TEST_F(MetaContainer, SequenceContainerConstMetaAny) {
+TEST(MetaContainer, SequenceContainerConstMetaAny) {
     auto test = [](const entt::meta_any any) {
         auto view = any.as_sequence_container();
 
@@ -642,7 +624,7 @@ TEST_F(MetaContainer, SequenceContainerConstMetaAny) {
     test(entt::forward_as_meta(std::as_const(vec)));
 }
 
-ENTT_DEBUG_TEST_F(MetaContainerDeathTest, SequenceContainerConstMetaAny) {
+ENTT_DEBUG_TEST(MetaContainerDeathTest, SequenceContainerConstMetaAny) {
     auto test = [](const entt::meta_any any) {
         auto view = any.as_sequence_container();
 
@@ -657,7 +639,7 @@ ENTT_DEBUG_TEST_F(MetaContainerDeathTest, SequenceContainerConstMetaAny) {
     test(entt::forward_as_meta(std::as_const(vec)));
 }
 
-TEST_F(MetaContainer, KeyValueAssociativeContainerConstMetaAny) {
+TEST(MetaContainer, KeyValueAssociativeContainerConstMetaAny) {
     auto test = [](const entt::meta_any any) {
         auto view = any.as_associative_container();
 
@@ -673,7 +655,7 @@ TEST_F(MetaContainer, KeyValueAssociativeContainerConstMetaAny) {
     test(entt::forward_as_meta(std::as_const(map)));
 }
 
-ENTT_DEBUG_TEST_F(MetaContainerDeathTest, KeyValueAssociativeContainerConstMetaAny) {
+ENTT_DEBUG_TEST(MetaContainerDeathTest, KeyValueAssociativeContainerConstMetaAny) {
     auto test = [](const entt::meta_any any) {
         auto view = any.as_associative_container();
 
@@ -688,7 +670,7 @@ ENTT_DEBUG_TEST_F(MetaContainerDeathTest, KeyValueAssociativeContainerConstMetaA
     test(entt::forward_as_meta(std::as_const(map)));
 }
 
-TEST_F(MetaContainer, KeyOnlyAssociativeContainerConstMetaAny) {
+TEST(MetaContainer, KeyOnlyAssociativeContainerConstMetaAny) {
     auto test = [](const entt::meta_any any) {
         auto view = any.as_associative_container();
 
@@ -708,7 +690,7 @@ TEST_F(MetaContainer, KeyOnlyAssociativeContainerConstMetaAny) {
     test(entt::forward_as_meta(std::as_const(set)));
 }
 
-TEST_F(MetaContainer, StdVectorBool) {
+TEST(MetaContainer, StdVectorBool) {
     using proxy_type = typename std::vector<bool>::reference;
     using const_proxy_type = typename std::vector<bool>::const_reference;
 

+ 0 - 3
test/entt/meta/meta_data.cpp

@@ -103,9 +103,6 @@ struct MetaData: ::testing::Test {
     void SetUp() override {
         using namespace entt::literals;
 
-        entt::meta<double>()
-            .type("double"_hs);
-
         entt::meta<base_t>()
             .type("base"_hs)
             .dtor<base_t::destroy>()

+ 0 - 3
test/entt/meta/meta_func.cpp

@@ -91,9 +91,6 @@ struct MetaFunc: ::testing::Test {
     void SetUp() override {
         using namespace entt::literals;
 
-        entt::meta<double>()
-            .type("double"_hs);
-
         entt::meta<base_t>()
             .type("base"_hs)
             .dtor<base_t::destroy>()