diff options
Diffstat (limited to 'tests/gtests/blenlib/BLI_set_test.cc')
-rw-r--r-- | tests/gtests/blenlib/BLI_set_test.cc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/tests/gtests/blenlib/BLI_set_test.cc index 189f0c1b134..fcd958dc2f1 100644 --- a/tests/gtests/blenlib/BLI_set_test.cc +++ b/tests/gtests/blenlib/BLI_set_test.cc @@ -16,7 +16,7 @@ namespace blender { TEST(set, DefaultConstructor) { Set<int> set; - EXPECT_EQ(set.size(), 0u); + EXPECT_EQ(set.size(), 0); EXPECT_TRUE(set.is_empty()); } @@ -54,7 +54,7 @@ TEST(set, AddMany) TEST(set, InitializerListConstructor) { Set<int> set = {4, 5, 6}; - EXPECT_EQ(set.size(), 3u); + EXPECT_EQ(set.size(), 3); EXPECT_TRUE(set.contains(4)); EXPECT_TRUE(set.contains(5)); EXPECT_TRUE(set.contains(6)); @@ -79,10 +79,10 @@ TEST(set, CopyConstructor) TEST(set, MoveConstructor) { Set<int> set = {1, 2, 3}; - EXPECT_EQ(set.size(), 3u); + EXPECT_EQ(set.size(), 3); Set<int> set2(std::move(set)); - EXPECT_EQ(set.size(), 0u); - EXPECT_EQ(set2.size(), 3u); + EXPECT_EQ(set.size(), 0); + EXPECT_EQ(set2.size(), 3); } TEST(set, CopyAssignment) @@ -103,11 +103,11 @@ TEST(set, CopyAssignment) TEST(set, MoveAssignment) { Set<int> set = {1, 2, 3}; - EXPECT_EQ(set.size(), 3u); + EXPECT_EQ(set.size(), 3); Set<int> set2; set2 = std::move(set); - EXPECT_EQ(set.size(), 0u); - EXPECT_EQ(set2.size(), 3u); + EXPECT_EQ(set.size(), 0); + EXPECT_EQ(set2.size(), 3); } TEST(set, RemoveContained) @@ -179,7 +179,7 @@ TEST(set, AddMultiple) a.add_multiple({2, 4, 7}); EXPECT_TRUE(a.contains(4)); EXPECT_TRUE(a.contains(2)); - EXPECT_EQ(a.size(), 4u); + EXPECT_EQ(a.size(), 4); } TEST(set, AddMultipleNew) @@ -197,7 +197,7 @@ TEST(set, Iterator) for (int value : set) { vec.append(value); } - EXPECT_EQ(vec.size(), 5u); + EXPECT_EQ(vec.size(), 5); EXPECT_TRUE(vec.contains(1)); EXPECT_TRUE(vec.contains(3)); EXPECT_TRUE(vec.contains(2)); @@ -210,9 +210,9 @@ TEST(set, OftenAddRemoveContained) Set<int> set; for (int i = 0; i < 100; i++) { set.add(42); - EXPECT_EQ(set.size(), 1u); + EXPECT_EQ(set.size(), 1); set.remove_contained(42); - EXPECT_EQ(set.size(), 0u); + EXPECT_EQ(set.size(), 0); } } @@ -224,15 +224,15 @@ TEST(set, UniquePtrValues) set.add_new(std::move(value1)); set.add(std::unique_ptr<int>(new int())); - EXPECT_EQ(set.size(), 3u); + EXPECT_EQ(set.size(), 3); } TEST(set, Clear) { Set<int> set = {3, 4, 6, 7}; - EXPECT_EQ(set.size(), 4u); + EXPECT_EQ(set.size(), 4); set.clear(); - EXPECT_EQ(set.size(), 0u); + EXPECT_EQ(set.size(), 0); } TEST(set, StringSet) @@ -240,7 +240,7 @@ TEST(set, StringSet) Set<std::string> set; set.add("hello"); set.add("world"); - EXPECT_EQ(set.size(), 2u); + EXPECT_EQ(set.size(), 2); EXPECT_TRUE(set.contains("hello")); EXPECT_TRUE(set.contains("world")); EXPECT_FALSE(set.contains("world2")); @@ -252,7 +252,7 @@ TEST(set, PointerSet) Set<int *> set; set.add(&a); set.add(&b); - EXPECT_EQ(set.size(), 2u); + EXPECT_EQ(set.size(), 2); EXPECT_TRUE(set.contains(&a)); EXPECT_TRUE(set.contains(&b)); EXPECT_FALSE(set.contains(&c)); @@ -261,14 +261,14 @@ TEST(set, PointerSet) TEST(set, Remove) { Set<int> set = {1, 2, 3, 4, 5, 6}; - EXPECT_EQ(set.size(), 6u); + EXPECT_EQ(set.size(), 6); EXPECT_TRUE(set.remove(2)); - EXPECT_EQ(set.size(), 5u); + EXPECT_EQ(set.size(), 5); EXPECT_FALSE(set.contains(2)); EXPECT_FALSE(set.remove(2)); - EXPECT_EQ(set.size(), 5u); + EXPECT_EQ(set.size(), 5); EXPECT_TRUE(set.remove(5)); - EXPECT_EQ(set.size(), 4u); + EXPECT_EQ(set.size(), 4); } struct Type1 { @@ -363,7 +363,7 @@ template<uint N> struct EqualityIntModN { }; template<uint N> struct HashIntModN { - uint32_t operator()(uint value) const + uint64_t operator()(uint value) const { return value % N; } @@ -409,7 +409,7 @@ struct MyKeyType { uint32_t key; int32_t attached_data; - uint32_t hash() const + uint64_t hash() const { return key; } @@ -455,11 +455,11 @@ TEST(set, LookupKeyPtr) */ #if 0 template<typename SetT> -BLI_NOINLINE void benchmark_random_ints(StringRef name, uint amount, uint factor) +BLI_NOINLINE void benchmark_random_ints(StringRef name, int amount, int factor) { RNG *rng = BLI_rng_new(0); Vector<int> values; - for (uint i = 0; i < amount; i++) { + for (int i = 0; i < amount; i++) { values.append(BLI_rng_get_int(rng) * factor); } BLI_rng_free(rng); @@ -491,12 +491,12 @@ BLI_NOINLINE void benchmark_random_ints(StringRef name, uint amount, uint factor TEST(set, Benchmark) { - for (uint i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { benchmark_random_ints<blender::Set<int>>("blender::Set ", 100000, 1); benchmark_random_ints<blender::StdUnorderedSetWrapper<int>>("std::unordered_set", 100000, 1); } std::cout << "\n"; - for (uint i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { uint32_t factor = (3 << 10); benchmark_random_ints<blender::Set<int>>("blender::Set ", 100000, factor); benchmark_random_ints<blender::StdUnorderedSetWrapper<int>>("std::unordered_set", 100000, factor); |