tests: review

test/entt/entity/group.cpp

@@ -395,12 +395,12 @@ TEST(NonOwningGroup, ExcludedComponents) {
     registry.assign<char>(e3);
 
     for(const auto entity: group) {
+        ASSERT_TRUE(entity == e0 || entity == e2);
+
         if(entity == e0) {
             ASSERT_EQ(group.get<int>(e0), 0);
         } else if(entity == e2) {
             ASSERT_EQ(group.get<int>(e2), 2);
-        } else {
-            FAIL();
         }
     }
 
@@ -413,12 +413,12 @@ TEST(NonOwningGroup, ExcludedComponents) {
     registry.remove<char>(e3);
 
     for(const auto entity: group) {
+        ASSERT_TRUE(entity == e1 || entity == e3);
+
         if(entity == e1) {
             ASSERT_EQ(group.get<int>(e1), 1);
         } else if(entity == e3) {
             ASSERT_EQ(group.get<int>(e3), 3);
-        } else {
-            FAIL();
         }
     }
 }
@@ -483,9 +483,7 @@ TEST(NonOwningGroup, Less) {
         ASSERT_EQ(entity, entt);
     });
 
-    registry.group(entt::get<int, char, double>).less([](const auto, int, char, double) {
-        FAIL();
-    });
+    registry.group(entt::get<int, char, double>).less([](const auto, int, char, double) { FAIL(); });
 }
 
 TEST(NonOwningGroup, SignalRace) {
@@ -969,12 +967,12 @@ TEST(OwningGroup, ExcludedComponents) {
     registry.assign<double>(e3);
 
     for(const auto entity: group) {
+        ASSERT_TRUE(entity == e0 || entity == e2);
+
         if(entity == e0) {
             ASSERT_EQ(group.get<int>(e0), 0);
         } else if(entity == e2) {
             ASSERT_EQ(group.get<int>(e2), 2);
-        } else {
-            FAIL();
         }
     }
 
@@ -987,12 +985,12 @@ TEST(OwningGroup, ExcludedComponents) {
     registry.remove<double>(e3);
 
     for(const auto entity: group) {
+        ASSERT_TRUE(entity == e1 || entity == e3);
+
         if(entity == e1) {
             ASSERT_EQ(group.get<int>(e1), 1);
         } else if(entity == e3) {
             ASSERT_EQ(group.get<int>(e3), 3);
-        } else {
-            FAIL();
         }
     }
 }
@@ -1057,9 +1055,7 @@ TEST(OwningGroup, Less) {
         ASSERT_EQ(entity, entt);
     });
 
-    registry.group<double>(entt::get<int, char>).less([](const auto, double, int, char) {
-        FAIL();
-    });
+    registry.group<double>(entt::get<int, char>).less([](const auto, double, int, char) { FAIL(); });
 }
 
 TEST(OwningGroup, SignalRace) {

test/entt/entity/registry.cpp

@@ -802,9 +802,7 @@ TEST(Registry, SortOwned) {
     ASSERT_EQ(*(registry.raw<int>()+3), 3);
     ASSERT_EQ(*(registry.raw<int>()+4), 4);
 
-    registry.sort<int>([](const int lhs, const int rhs) {
-        return lhs < rhs;
-    });
+    registry.sort<int>(std::less{});
 
     ASSERT_EQ(*(registry.raw<int>()+0), 0);
     ASSERT_EQ(*(registry.raw<int>()+1), 1);
@@ -813,9 +811,7 @@ TEST(Registry, SortOwned) {
     ASSERT_EQ(*(registry.raw<int>()+4), 2);
 
     registry.reset<char>();
-    registry.sort<int>([](const int lhs, const int rhs) {
-        return lhs < rhs;
-    });
+    registry.sort<int>(std::less{});
 
     ASSERT_EQ(*(registry.raw<int>()+0), 4);
     ASSERT_EQ(*(registry.raw<int>()+1), 3);
@@ -827,9 +823,7 @@ TEST(Registry, SortOwned) {
         registry.assign<char>(entity);
     });
 
-    registry.sort<int>([](const int lhs, const int rhs) {
-        return lhs > rhs;
-    });
+    registry.sort<int>(std::greater{});
 
     ASSERT_EQ(*(registry.raw<int>()+0), 4);
     ASSERT_EQ(*(registry.raw<int>()+1), 3);
@@ -838,9 +832,7 @@ TEST(Registry, SortOwned) {
     ASSERT_EQ(*(registry.raw<int>()+4), 0);
 
     registry.reset<char>();
-    registry.sort<int>([](const int lhs, const int rhs) {
-        return lhs > rhs;
-    });
+    registry.sort<int>(std::greater{});
 
     ASSERT_EQ(*(registry.raw<int>()+0), 0);
     ASSERT_EQ(*(registry.raw<int>()+1), 1);
@@ -1332,8 +1324,8 @@ TEST(Registry, NonOwningGroupSortInterleaved) {
     registry.assign<int>(e1, 1);
     registry.assign<char>(e1, '1');
 
-    registry.sort<int>([](auto lhs, auto rhs) { return lhs > rhs; });
-    registry.sort<char>([](auto lhs, auto rhs) { return lhs < rhs; });
+    registry.sort<int>(std::greater{});
+    registry.sort<char>(std::less{});
 
     const auto e2 = registry.create();
     registry.assign<int>(e2, 2);

test/entt/entity/runtime_view.cpp

@@ -1,4 +1,5 @@
 #include <iterator>
+#include <algorithm>
 #include <gtest/gtest.h>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/runtime_view.hpp>
@@ -105,10 +106,10 @@ TEST(RuntimeView, Empty) {
     entt::component types[] = { registry.type<char>(), registry.type<int>(), registry.type<float>() };
     auto view = registry.runtime_view(std::begin(types), std::end(types));
 
-    for(auto entity: view) {
-        (void)entity;
-        FAIL();
-    }
+    view.each([](auto) { FAIL(); });
+
+    ASSERT_EQ((std::find(view.begin(), view.end(), e0)), view.end());
+    ASSERT_EQ((std::find(view.begin(), view.end(), e1)), view.end());
 }
 
 TEST(RuntimeView, Each) {
@@ -172,10 +173,7 @@ TEST(RuntimeView, MissingPool) {
 
     view.each([](auto) { FAIL(); });
 
-    for(auto entity: view) {
-        (void)entity;
-        FAIL();
-    }
+    ASSERT_EQ((std::find(view.begin(), view.end(), e0)), view.end());
 }
 
 TEST(RuntimeView, EmptyRange) {
@@ -193,8 +191,5 @@ TEST(RuntimeView, EmptyRange) {
 
     view.each([](auto) { FAIL(); });
 
-    for(auto entity: view) {
-        (void)entity;
-        FAIL();
-    }
+    ASSERT_EQ((std::find(view.begin(), view.end(), e0)), view.end());
 }

test/entt/entity/view.cpp

@@ -395,12 +395,9 @@ TEST(MultiComponentView, EachWithHoles) {
     auto view = registry.view<char, int>();
 
     view.each([e0](auto entity, const char &c, const int &i) {
-        if(e0 == entity) {
-            ASSERT_EQ(c, '0');
-            ASSERT_EQ(i, 0);
-        } else {
-            FAIL();
-        }
+        ASSERT_EQ(entity, e0);
+        ASSERT_EQ(c, '0');
+        ASSERT_EQ(i, 0);
     });
 }
 
@@ -496,12 +493,12 @@ TEST(MultiComponentView, ExcludedComponents) {
     registry.assign<char>(e3);
 
     for(const auto entity: view) {
+        ASSERT_TRUE(entity == e0 || entity == e2);
+
         if(entity == e0) {
             ASSERT_EQ(view.get<int>(e0), 0);
         } else if(entity == e2) {
             ASSERT_EQ(view.get(e2), 2);
-        } else {
-            FAIL();
         }
     }
 
@@ -511,12 +508,12 @@ TEST(MultiComponentView, ExcludedComponents) {
     registry.remove<char>(e3);
 
     for(const auto entity: view) {
+        ASSERT_TRUE(entity == e1 || entity == e3);
+
         if(entity == e1) {
             ASSERT_EQ(view.get(e1), 1);
         } else if(entity == e3) {
             ASSERT_EQ(view.get<int>(e3), 3);
-        } else {
-            FAIL();
         }
     }
 }