From 49a066714a2d27cc1d5f4ee1b8fec122006ffa7b Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Fri, 28 Jan 2022 14:00:33 +0100
Subject: [PATCH] test: minor changes

---
 test/entt/container/dense_map.cpp | 52 +++++++++++++++----------------
 test/entt/container/dense_set.cpp | 42 ++++++++++++-------------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp
index 391686c8c..a00046b31 100644
--- a/test/entt/container/dense_map.cpp
+++ b/test/entt/container/dense_map.cpp
@@ -19,7 +19,7 @@ struct transparent_equal_to {
     }
 };
 
-TEST(DenseHashMap, Functionalities) {
+TEST(DenseMap, Functionalities) {
     entt::dense_map<std::size_t, std::size_t, entt::identity, transparent_equal_to> map;
 
     ASSERT_NO_THROW([[maybe_unused]] auto alloc = map.get_allocator());
@@ -85,7 +85,7 @@ TEST(DenseHashMap, Functionalities) {
     ASSERT_FALSE(map.contains(0u));
 }
 
-TEST(DenseHashMap, Contructors) {
+TEST(DenseMap, Contructors) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<int, int> map;
 
@@ -106,7 +106,7 @@ TEST(DenseHashMap, Contructors) {
     ASSERT_EQ(other.bucket_count(), 4u * minimum_bucket_count);
 }
 
-TEST(DenseHashMap, Copy) {
+TEST(DenseMap, Copy) {
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
     map.max_load_factor(map.max_load_factor() - .05f);
     map.emplace(3u, 42u);
@@ -138,7 +138,7 @@ TEST(DenseHashMap, Copy) {
     ASSERT_EQ((++other.begin(3u))->first, 3u);
 }
 
-TEST(DenseHashMap, Move) {
+TEST(DenseMap, Move) {
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
     map.max_load_factor(map.max_load_factor() - .05f);
     map.emplace(3u, 42u);
@@ -170,7 +170,7 @@ TEST(DenseHashMap, Move) {
     ASSERT_EQ((++other.begin(3u))->first, 3u);
 }
 
-TEST(DenseHashMap, Iterator) {
+TEST(DenseMap, Iterator) {
     using iterator = typename entt::dense_map<int, int>::iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::pair<const int, int>>);
@@ -223,7 +223,7 @@ TEST(DenseHashMap, Iterator) {
     ASSERT_EQ(begin[1u].second, 3);
 }
 
-TEST(DenseHashMap, ConstIterator) {
+TEST(DenseMap, ConstIterator) {
     using iterator = typename entt::dense_map<int, int>::const_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::pair<const int, int>>);
@@ -276,7 +276,7 @@ TEST(DenseHashMap, ConstIterator) {
     ASSERT_EQ(cbegin[1u].second, 3);
 }
 
-TEST(DenseHashMap, IteratorConversion) {
+TEST(DenseMap, IteratorConversion) {
     entt::dense_map<int, int> map;
     map.emplace(3, 42);
 
@@ -301,7 +301,7 @@ TEST(DenseHashMap, IteratorConversion) {
     ASSERT_NE(++cit, it);
 }
 
-TEST(DenseHashMap, Insert) {
+TEST(DenseMap, Insert) {
     entt::dense_map<int, int> map;
     typename entt::dense_map<int, int>::iterator it;
     bool result;
@@ -380,7 +380,7 @@ TEST(DenseHashMap, Insert) {
     ASSERT_EQ(map.find(9)->second, 10);
 }
 
-TEST(DenseHashMap, InsertRehash) {
+TEST(DenseMap, InsertRehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -414,7 +414,7 @@ TEST(DenseHashMap, InsertRehash) {
     }
 }
 
-TEST(DenseHashMap, InsertSameBucket) {
+TEST(DenseMap, InsertSameBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -434,7 +434,7 @@ TEST(DenseHashMap, InsertSameBucket) {
     ASSERT_EQ(map.cbegin(6u), map.cend(6u));
 }
 
-TEST(DenseHashMap, InsertOrAssign) {
+TEST(DenseMap, InsertOrAssign) {
     entt::dense_map<int, int> map;
     typename entt::dense_map<int, int>::iterator it;
     bool result;
@@ -497,7 +497,7 @@ TEST(DenseHashMap, InsertOrAssign) {
     ASSERT_EQ(it->second, 99);
 }
 
-TEST(DenseHashMap, Emplace) {
+TEST(DenseMap, Emplace) {
     entt::dense_map<int, int> map;
     typename entt::dense_map<int, int>::iterator it;
     bool result;
@@ -583,7 +583,7 @@ TEST(DenseHashMap, Emplace) {
     ASSERT_EQ(it->second, 2);
 }
 
-TEST(DenseHashMap, EmplaceRehash) {
+TEST(DenseMap, EmplaceRehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -618,7 +618,7 @@ TEST(DenseHashMap, EmplaceRehash) {
     }
 }
 
-TEST(DenseHashMap, EmplaceSameBucket) {
+TEST(DenseMap, EmplaceSameBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -638,7 +638,7 @@ TEST(DenseHashMap, EmplaceSameBucket) {
     ASSERT_EQ(map.cbegin(6u), map.cend(6u));
 }
 
-TEST(DenseHashMap, TryEmplace) {
+TEST(DenseMap, TryEmplace) {
     entt::dense_map<int, int> map;
     typename entt::dense_map<int, int>::iterator it;
     bool result;
@@ -666,7 +666,7 @@ TEST(DenseHashMap, TryEmplace) {
     ASSERT_EQ(it->second, 2);
 }
 
-TEST(DenseHashMap, TryEmplaceRehash) {
+TEST(DenseMap, TryEmplaceRehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -700,7 +700,7 @@ TEST(DenseHashMap, TryEmplaceRehash) {
     }
 }
 
-TEST(DenseHashMap, TryEmplaceSameBucket) {
+TEST(DenseMap, TryEmplaceSameBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -720,7 +720,7 @@ TEST(DenseHashMap, TryEmplaceSameBucket) {
     ASSERT_EQ(map.cbegin(6u), map.cend(6u));
 }
 
-TEST(DenseHashMap, Erase) {
+TEST(DenseMap, Erase) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -770,7 +770,7 @@ TEST(DenseHashMap, Erase) {
     ASSERT_EQ(map.size(), 0u);
 }
 
-TEST(DenseHashMap, EraseFromBucket) {
+TEST(DenseMap, EraseFromBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
 
@@ -861,7 +861,7 @@ TEST(DenseHashMap, EraseFromBucket) {
     ASSERT_FALSE(map.contains(4u * minimum_bucket_count + 2u));
 }
 
-TEST(DenseHashMap, Swap) {
+TEST(DenseMap, Swap) {
     entt::dense_map<int, int> map;
     entt::dense_map<int, int> other;
 
@@ -880,7 +880,7 @@ TEST(DenseHashMap, Swap) {
     ASSERT_TRUE(other.contains(0));
 }
 
-TEST(DenseHashMap, Indexing) {
+TEST(DenseMap, Indexing) {
     entt::dense_map<int, int> map;
     const auto key = 1;
 
@@ -896,7 +896,7 @@ TEST(DenseHashMap, Indexing) {
     ASSERT_EQ(map.at(key), 99);
 }
 
-TEST(DenseHashMap, LocalIterator) {
+TEST(DenseMap, LocalIterator) {
     using iterator = typename entt::dense_map<std::size_t, std::size_t, entt::identity>::local_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::pair<const std::size_t, std::size_t>>);
@@ -924,7 +924,7 @@ TEST(DenseHashMap, LocalIterator) {
     ASSERT_EQ(++begin, map.end(3u));
 }
 
-TEST(DenseHashMap, ConstLocalIterator) {
+TEST(DenseMap, ConstLocalIterator) {
     using iterator = typename entt::dense_map<std::size_t, std::size_t, entt::identity>::const_local_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::pair<const std::size_t, std::size_t>>);
@@ -952,7 +952,7 @@ TEST(DenseHashMap, ConstLocalIterator) {
     ASSERT_EQ(++cbegin, map.end(3u));
 }
 
-TEST(DenseHashMap, LocalIteratorConversion) {
+TEST(DenseMap, LocalIteratorConversion) {
     entt::dense_map<int, int> map;
     map.emplace(3, 42);
 
@@ -971,7 +971,7 @@ TEST(DenseHashMap, LocalIteratorConversion) {
     ASSERT_NE(++cit, it);
 }
 
-TEST(DenseHashMap, Rehash) {
+TEST(DenseMap, Rehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<std::size_t, std::size_t, entt::identity> map;
     map[32u] = 99u;
@@ -1054,7 +1054,7 @@ TEST(DenseHashMap, Rehash) {
     ASSERT_EQ(map.bucket_size(3u), 0u);
 }
 
-TEST(DenseHashMap, Reserve) {
+TEST(DenseMap, Reserve) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_map<int, int> map;
 
diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp
index 3d80d285b..66a70a1f2 100644
--- a/test/entt/container/dense_set.cpp
+++ b/test/entt/container/dense_set.cpp
@@ -19,7 +19,7 @@ struct transparent_equal_to {
     }
 };
 
-TEST(DenseHashSet, Functionalities) {
+TEST(DenseSet, Functionalities) {
     entt::dense_set<std::size_t, entt::identity, transparent_equal_to> set;
 
     ASSERT_NO_THROW([[maybe_unused]] auto alloc = set.get_allocator());
@@ -85,7 +85,7 @@ TEST(DenseHashSet, Functionalities) {
     ASSERT_FALSE(set.contains(0u));
 }
 
-TEST(DenseHashSet, Contructors) {
+TEST(DenseSet, Contructors) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<int> set;
 
@@ -106,7 +106,7 @@ TEST(DenseHashSet, Contructors) {
     ASSERT_EQ(other.bucket_count(), 4u * minimum_bucket_count);
 }
 
-TEST(DenseHashSet, Copy) {
+TEST(DenseSet, Copy) {
     entt::dense_set<std::size_t, entt::identity> set;
     set.max_load_factor(set.max_load_factor() - .05f);
     set.emplace(3u);
@@ -134,7 +134,7 @@ TEST(DenseHashSet, Copy) {
     ASSERT_EQ((*++other.begin(3u)), 3u);
 }
 
-TEST(DenseHashSet, Move) {
+TEST(DenseSet, Move) {
     entt::dense_set<std::size_t, entt::identity> set;
     set.max_load_factor(set.max_load_factor() - .05f);
     set.emplace(3u);
@@ -162,7 +162,7 @@ TEST(DenseHashSet, Move) {
     ASSERT_EQ(*++other.begin(3u), 3u);
 }
 
-TEST(DenseHashSet, Iterator) {
+TEST(DenseSet, Iterator) {
     using iterator = typename entt::dense_set<int>::iterator;
 
     static_assert(std::is_same_v<iterator::value_type, int>);
@@ -215,7 +215,7 @@ TEST(DenseHashSet, Iterator) {
     ASSERT_EQ(begin[1u], 42);
 }
 
-TEST(DenseHashSet, ConstIterator) {
+TEST(DenseSet, ConstIterator) {
     using iterator = typename entt::dense_set<int>::const_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, int>);
@@ -268,7 +268,7 @@ TEST(DenseHashSet, ConstIterator) {
     ASSERT_EQ(cbegin[1u], 42);
 }
 
-TEST(DenseHashSet, IteratorConversion) {
+TEST(DenseSet, IteratorConversion) {
     entt::dense_set<int> set;
     set.emplace(3);
 
@@ -293,7 +293,7 @@ TEST(DenseHashSet, IteratorConversion) {
     ASSERT_NE(++cit, it);
 }
 
-TEST(DenseHashSet, Insert) {
+TEST(DenseSet, Insert) {
     entt::dense_set<int> set;
     typename entt::dense_set<int>::iterator it;
     bool result;
@@ -344,7 +344,7 @@ TEST(DenseHashSet, Insert) {
     ASSERT_NE(set.find(9), set.end());
 }
 
-TEST(DenseHashSet, InsertRehash) {
+TEST(DenseSet, InsertRehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -375,7 +375,7 @@ TEST(DenseHashSet, InsertRehash) {
     }
 }
 
-TEST(DenseHashSet, InsertSameBucket) {
+TEST(DenseSet, InsertSameBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -395,7 +395,7 @@ TEST(DenseHashSet, InsertSameBucket) {
     ASSERT_EQ(set.cbegin(6u), set.cend(6u));
 }
 
-TEST(DenseHashSet, Emplace) {
+TEST(DenseSet, Emplace) {
     entt::dense_set<int> set;
     typename entt::dense_set<int>::iterator it;
     bool result;
@@ -438,7 +438,7 @@ TEST(DenseHashSet, Emplace) {
     ASSERT_EQ(*it, 1);
 }
 
-TEST(DenseHashSet, EmplaceRehash) {
+TEST(DenseSet, EmplaceRehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -470,7 +470,7 @@ TEST(DenseHashSet, EmplaceRehash) {
     }
 }
 
-TEST(DenseHashSet, EmplaceSameBucket) {
+TEST(DenseSet, EmplaceSameBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -490,7 +490,7 @@ TEST(DenseHashSet, EmplaceSameBucket) {
     ASSERT_EQ(set.cbegin(6u), set.cend(6u));
 }
 
-TEST(DenseHashSet, Erase) {
+TEST(DenseSet, Erase) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -540,7 +540,7 @@ TEST(DenseHashSet, Erase) {
     ASSERT_EQ(set.size(), 0u);
 }
 
-TEST(DenseHashSet, EraseFromBucket) {
+TEST(DenseSet, EraseFromBucket) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
 
@@ -631,7 +631,7 @@ TEST(DenseHashSet, EraseFromBucket) {
     ASSERT_FALSE(set.contains(4u * minimum_bucket_count + 2u));
 }
 
-TEST(DenseHashSet, Swap) {
+TEST(DenseSet, Swap) {
     entt::dense_set<int> set;
     entt::dense_set<int> other;
 
@@ -650,7 +650,7 @@ TEST(DenseHashSet, Swap) {
     ASSERT_TRUE(other.contains(0));
 }
 
-TEST(DenseHashSet, LocalIterator) {
+TEST(DenseSet, LocalIterator) {
     using iterator = typename entt::dense_set<std::size_t, entt::identity>::local_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::size_t>);
@@ -678,7 +678,7 @@ TEST(DenseHashSet, LocalIterator) {
     ASSERT_EQ(++begin, set.end(3u));
 }
 
-TEST(DenseHashSet, ConstLocalIterator) {
+TEST(DenseSet, ConstLocalIterator) {
     using iterator = typename entt::dense_set<std::size_t, entt::identity>::const_local_iterator;
 
     static_assert(std::is_same_v<iterator::value_type, std::size_t>);
@@ -706,7 +706,7 @@ TEST(DenseHashSet, ConstLocalIterator) {
     ASSERT_EQ(++cbegin, set.end(3u));
 }
 
-TEST(DenseHashSet, LocalIteratorConversion) {
+TEST(DenseSet, LocalIteratorConversion) {
     entt::dense_set<int> set;
     set.emplace(3);
 
@@ -725,7 +725,7 @@ TEST(DenseHashSet, LocalIteratorConversion) {
     ASSERT_NE(++cit, it);
 }
 
-TEST(DenseHashSet, Rehash) {
+TEST(DenseSet, Rehash) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<std::size_t, entt::identity> set;
     set.emplace(32u);
@@ -800,7 +800,7 @@ TEST(DenseHashSet, Rehash) {
     ASSERT_EQ(set.bucket_size(3u), 0u);
 }
 
-TEST(DenseHashSet, Reserve) {
+TEST(DenseSet, Reserve) {
     static constexpr std::size_t minimum_bucket_count = 8u;
     entt::dense_set<int> set;