From 03a45d9cca600ddabff253e4b922da806c02858d Mon Sep 17 00:00:00 2001 From: skypjack Date: Sat, 15 Nov 2025 18:51:35 +0100 Subject: [PATCH] test: clang-tidy friendly tests --- test/entt/container/dense_map.cpp | 34 +++++++++++++++---------------- test/entt/container/dense_set.cpp | 34 +++++++++++++++---------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp index bbfd5eb18..e20d7534a 100644 --- a/test/entt/container/dense_map.cpp +++ b/test/entt/container/dense_map.cpp @@ -819,8 +819,8 @@ TEST(DenseMap, EraseFromBucket) { for(std::size_t next{}; next < 4u; ++next) { ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next, 2u * minimum_bucket_count * next).second); - ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next + 2u, 2u * minimum_bucket_count * next + 2u).second); - ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next + 3u, 2u * minimum_bucket_count * next + 3u).second); + ASSERT_TRUE(map.emplace((2u * minimum_bucket_count * next) + 2u, (2u * minimum_bucket_count * next) + 2u).second); + ASSERT_TRUE(map.emplace((2u * minimum_bucket_count * next) + 3u, (2u * minimum_bucket_count * next) + 3u).second); } ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count); @@ -843,16 +843,16 @@ TEST(DenseMap, EraseFromBucket) { ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next)); ASSERT_EQ(map.bucket(2u * minimum_bucket_count * next), 0u); - ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next + 2u)); - ASSERT_EQ(map.bucket(2u * minimum_bucket_count * next + 2u), 2u); + ASSERT_TRUE(map.contains((2u * minimum_bucket_count * next) + 2u)); + ASSERT_EQ(map.bucket((2u * minimum_bucket_count * next) + 2u), 2u); - ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next + 3u)); - ASSERT_EQ(map.bucket(2u * minimum_bucket_count * next + 3u), 3u); + ASSERT_TRUE(map.contains((2u * minimum_bucket_count * next) + 3u)); + ASSERT_EQ(map.bucket((2u * minimum_bucket_count * next) + 3u), 3u); } ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u)); - ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u + 2u)); - ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u + 3u)); + ASSERT_FALSE(map.contains((2u * minimum_bucket_count * 3u) + 2u)); + ASSERT_FALSE(map.contains((2u * minimum_bucket_count * 3u) + 3u)); map.erase((++map.begin(0u))->first); map.erase((++map.begin(2u))->first); @@ -866,8 +866,8 @@ TEST(DenseMap, EraseFromBucket) { ASSERT_EQ(map.bucket_size(3u), 2u); ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u)); - ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u + 2u)); - ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u + 3u)); + ASSERT_FALSE(map.contains((2u * minimum_bucket_count * 1u) + 2u)); + ASSERT_FALSE(map.contains((2u * minimum_bucket_count * 1u) + 3u)); while(map.begin(3) != map.end(3u)) { map.erase(map.begin(3)->first); @@ -881,11 +881,11 @@ TEST(DenseMap, EraseFromBucket) { ASSERT_EQ(map.bucket_size(3u), 0u); ASSERT_TRUE(map.contains(0u * minimum_bucket_count)); - ASSERT_TRUE(map.contains(0u * minimum_bucket_count + 2u)); + ASSERT_TRUE(map.contains((0u * minimum_bucket_count) + 2u)); ASSERT_TRUE(map.contains(4u * minimum_bucket_count)); - ASSERT_TRUE(map.contains(4u * minimum_bucket_count + 2u)); + ASSERT_TRUE(map.contains((4u * minimum_bucket_count) + 2u)); - map.erase(4u * minimum_bucket_count + 2u); + map.erase((4u * minimum_bucket_count) + 2u); map.erase(0u * minimum_bucket_count); ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count); @@ -896,9 +896,9 @@ TEST(DenseMap, EraseFromBucket) { ASSERT_EQ(map.bucket_size(3u), 0u); ASSERT_FALSE(map.contains(0u * minimum_bucket_count)); - ASSERT_TRUE(map.contains(0u * minimum_bucket_count + 2u)); + ASSERT_TRUE(map.contains((0u * minimum_bucket_count) + 2u)); ASSERT_TRUE(map.contains(4u * minimum_bucket_count)); - ASSERT_FALSE(map.contains(4u * minimum_bucket_count + 2u)); + ASSERT_FALSE(map.contains((4u * minimum_bucket_count) + 2u)); } TEST(DenseMap, Swap) { @@ -1081,7 +1081,7 @@ TEST(DenseMap, Rehash) { ASSERT_EQ(map.bucket(32u), 0u); ASSERT_EQ(map[32u], 2u); - map.rehash(4u * minimum_bucket_count + 1u); + map.rehash((4u * minimum_bucket_count) + 1u); ASSERT_EQ(map.bucket_count(), 8u * minimum_bucket_count); ASSERT_TRUE(map.contains(32u)); @@ -1107,7 +1107,7 @@ TEST(DenseMap, Rehash) { ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count); ASSERT_TRUE(map.contains(32u)); - map.rehash(4u * minimum_bucket_count + 4u); + map.rehash((4u * minimum_bucket_count) + 4u); ASSERT_EQ(map.bucket_count(), 8u * minimum_bucket_count); ASSERT_TRUE(map.contains(32u)); diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp index 6d1f920e9..7701d3a57 100644 --- a/test/entt/container/dense_set.cpp +++ b/test/entt/container/dense_set.cpp @@ -676,8 +676,8 @@ TEST(DenseSet, EraseFromBucket) { for(std::size_t next{}; next < 4u; ++next) { ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next).second); - ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next + 2u).second); - ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next + 3u).second); + ASSERT_TRUE(set.emplace((2u * minimum_bucket_count * next) + 2u).second); + ASSERT_TRUE(set.emplace((2u * minimum_bucket_count * next) + 3u).second); } ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count); @@ -700,16 +700,16 @@ TEST(DenseSet, EraseFromBucket) { ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next)); ASSERT_EQ(set.bucket(2u * minimum_bucket_count * next), 0u); - ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next + 2u)); - ASSERT_EQ(set.bucket(2u * minimum_bucket_count * next + 2u), 2u); + ASSERT_TRUE(set.contains((2u * minimum_bucket_count * next) + 2u)); + ASSERT_EQ(set.bucket((2u * minimum_bucket_count * next) + 2u), 2u); - ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next + 3u)); - ASSERT_EQ(set.bucket(2u * minimum_bucket_count * next + 3u), 3u); + ASSERT_TRUE(set.contains((2u * minimum_bucket_count * next) + 3u)); + ASSERT_EQ(set.bucket((2u * minimum_bucket_count * next) + 3u), 3u); } ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u)); - ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u + 2u)); - ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u + 3u)); + ASSERT_FALSE(set.contains((2u * minimum_bucket_count * 3u) + 2u)); + ASSERT_FALSE(set.contains((2u * minimum_bucket_count * 3u) + 3u)); set.erase(*++set.begin(0u)); set.erase(*++set.begin(2u)); @@ -723,8 +723,8 @@ TEST(DenseSet, EraseFromBucket) { ASSERT_EQ(set.bucket_size(3u), 2u); ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u)); - ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u + 2u)); - ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u + 3u)); + ASSERT_FALSE(set.contains((2u * minimum_bucket_count * 1u) + 2u)); + ASSERT_FALSE(set.contains((2u * minimum_bucket_count * 1u) + 3u)); while(set.begin(3) != set.end(3u)) { set.erase(*set.begin(3)); @@ -738,11 +738,11 @@ TEST(DenseSet, EraseFromBucket) { ASSERT_EQ(set.bucket_size(3u), 0u); ASSERT_TRUE(set.contains(0u * minimum_bucket_count)); - ASSERT_TRUE(set.contains(0u * minimum_bucket_count + 2u)); + ASSERT_TRUE(set.contains((0u * minimum_bucket_count) + 2u)); ASSERT_TRUE(set.contains(4u * minimum_bucket_count)); - ASSERT_TRUE(set.contains(4u * minimum_bucket_count + 2u)); + ASSERT_TRUE(set.contains((4u * minimum_bucket_count) + 2u)); - set.erase(4u * minimum_bucket_count + 2u); + set.erase((4u * minimum_bucket_count) + 2u); set.erase(0u * minimum_bucket_count); ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count); @@ -753,9 +753,9 @@ TEST(DenseSet, EraseFromBucket) { ASSERT_EQ(set.bucket_size(3u), 0u); ASSERT_FALSE(set.contains(0u * minimum_bucket_count)); - ASSERT_TRUE(set.contains(0u * minimum_bucket_count + 2u)); + ASSERT_TRUE(set.contains((0u * minimum_bucket_count) + 2u)); ASSERT_TRUE(set.contains(4u * minimum_bucket_count)); - ASSERT_FALSE(set.contains(4u * minimum_bucket_count + 2u)); + ASSERT_FALSE(set.contains((4u * minimum_bucket_count) + 2u)); } TEST(DenseSet, Swap) { @@ -902,7 +902,7 @@ TEST(DenseSet, Rehash) { ASSERT_TRUE(set.contains(32u)); ASSERT_EQ(set.bucket(32u), 0u); - set.rehash(4u * minimum_bucket_count + 1u); + set.rehash((4u * minimum_bucket_count) + 1u); ASSERT_EQ(set.bucket_count(), 8u * minimum_bucket_count); ASSERT_TRUE(set.contains(32u)); @@ -926,7 +926,7 @@ TEST(DenseSet, Rehash) { ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count); ASSERT_TRUE(set.contains(32u)); - set.rehash(4u * minimum_bucket_count + 4u); + set.rehash((4u * minimum_bucket_count) + 4u); ASSERT_EQ(set.bucket_count(), 8u * minimum_bucket_count); ASSERT_TRUE(set.contains(32u));