diff options
Diffstat (limited to 'tests/gtests/blenlib/BLI_map_test.cc')
-rw-r--r-- | tests/gtests/blenlib/BLI_map_test.cc | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc index 4fb97c40e86..cebce218112 100644 --- a/tests/gtests/blenlib/BLI_map_test.cc +++ b/tests/gtests/blenlib/BLI_map_test.cc @@ -13,20 +13,20 @@ namespace blender { TEST(map, DefaultConstructor) { Map<int, float> map; - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); EXPECT_TRUE(map.is_empty()); } TEST(map, AddIncreasesSize) { Map<int, float> map; - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); EXPECT_TRUE(map.is_empty()); map.add(2, 5.0f); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_FALSE(map.is_empty()); map.add(6, 2.0f); - EXPECT_EQ(map.size(), 2u); + EXPECT_EQ(map.size(), 2); EXPECT_FALSE(map.is_empty()); } @@ -89,16 +89,16 @@ TEST(map, PopTry) Map<int, int> map; map.add(1, 5); map.add(2, 7); - EXPECT_EQ(map.size(), 2u); + EXPECT_EQ(map.size(), 2); std::optional<int> value = map.pop_try(4); - EXPECT_EQ(map.size(), 2u); + EXPECT_EQ(map.size(), 2); EXPECT_FALSE(value.has_value()); value = map.pop_try(2); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_TRUE(value.has_value()); EXPECT_EQ(*value, 7); EXPECT_EQ(*map.pop_try(1), 5); - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); } TEST(map, PopDefault) @@ -107,17 +107,17 @@ TEST(map, PopDefault) map.add(1, 4); map.add(2, 7); map.add(3, 8); - EXPECT_EQ(map.size(), 3u); + EXPECT_EQ(map.size(), 3); EXPECT_EQ(map.pop_default(4, 10), 10); - EXPECT_EQ(map.size(), 3u); + EXPECT_EQ(map.size(), 3); EXPECT_EQ(map.pop_default(1, 10), 4); - EXPECT_EQ(map.size(), 2u); + EXPECT_EQ(map.size(), 2); EXPECT_EQ(map.pop_default(2, 20), 7); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_EQ(map.pop_default(2, 20), 20); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_EQ(map.pop_default(3, 0), 8); - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); } TEST(map, PopItemMany) @@ -143,13 +143,13 @@ TEST(map, ValueIterator) blender::Set<float> values; - uint iterations = 0; + int iterations = 0; for (float value : map.values()) { values.add(value); iterations++; } - EXPECT_EQ(iterations, 3u); + EXPECT_EQ(iterations, 3); EXPECT_TRUE(values.contains(5.0f)); EXPECT_TRUE(values.contains(-2.0f)); EXPECT_TRUE(values.contains(2.0f)); @@ -164,13 +164,13 @@ TEST(map, KeyIterator) blender::Set<int> keys; - uint iterations = 0; + int iterations = 0; for (int key : map.keys()) { keys.add(key); iterations++; } - EXPECT_EQ(iterations, 3u); + EXPECT_EQ(iterations, 3); EXPECT_TRUE(keys.contains(1)); EXPECT_TRUE(keys.contains(2)); EXPECT_TRUE(keys.contains(6)); @@ -186,7 +186,7 @@ TEST(map, ItemIterator) blender::Set<int> keys; blender::Set<float> values; - uint iterations = 0; + int iterations = 0; const Map<int, float> &const_map = map; for (auto item : const_map.items()) { keys.add(item.key); @@ -194,7 +194,7 @@ TEST(map, ItemIterator) iterations++; } - EXPECT_EQ(iterations, 3u); + EXPECT_EQ(iterations, 3); EXPECT_TRUE(keys.contains(5)); EXPECT_TRUE(keys.contains(2)); EXPECT_TRUE(keys.contains(1)); @@ -243,8 +243,8 @@ TEST(map, MutableItemToItemConversion) values.append(item.value); } - EXPECT_EQ(keys.size(), 2u); - EXPECT_EQ(values.size(), 2u); + EXPECT_EQ(keys.size(), 2); + EXPECT_EQ(values.size(), 2); EXPECT_TRUE(keys.contains(3)); EXPECT_TRUE(keys.contains(2)); EXPECT_TRUE(values.contains(6)); @@ -332,10 +332,10 @@ TEST(map, MoveConstructorSmall) map1.add(1, 2.0f); map1.add(4, 1.0f); Map<int, float> map2(std::move(map1)); - EXPECT_EQ(map2.size(), 2u); + EXPECT_EQ(map2.size(), 2); EXPECT_EQ(map2.lookup(1), 2.0f); EXPECT_EQ(map2.lookup(4), 1.0f); - EXPECT_EQ(map1.size(), 0u); + EXPECT_EQ(map1.size(), 0); EXPECT_EQ(map1.lookup_ptr(4), nullptr); } @@ -346,10 +346,10 @@ TEST(map, MoveConstructorLarge) map1.add_new(i, i); } Map<int, int> map2(std::move(map1)); - EXPECT_EQ(map2.size(), 100u); + EXPECT_EQ(map2.size(), 100); EXPECT_EQ(map2.lookup(1), 1); EXPECT_EQ(map2.lookup(4), 4); - EXPECT_EQ(map1.size(), 0u); + EXPECT_EQ(map1.size(), 0); EXPECT_EQ(map1.lookup_ptr(4), nullptr); } @@ -360,10 +360,10 @@ TEST(map, MoveAssignment) map1.add(4, 1.0f); Map<int, float> map2; map2 = std::move(map1); - EXPECT_EQ(map2.size(), 2u); + EXPECT_EQ(map2.size(), 2); EXPECT_EQ(map2.lookup(1), 2.0f); EXPECT_EQ(map2.lookup(4), 1.0f); - EXPECT_EQ(map1.size(), 0u); + EXPECT_EQ(map1.size(), 0); EXPECT_EQ(map1.lookup_ptr(4), nullptr); } @@ -374,10 +374,10 @@ TEST(map, CopyAssignment) map1.add(4, 1.0f); Map<int, float> map2; map2 = map1; - EXPECT_EQ(map2.size(), 2u); + EXPECT_EQ(map2.size(), 2); EXPECT_EQ(map2.lookup(1), 2.0f); EXPECT_EQ(map2.lookup(4), 1.0f); - EXPECT_EQ(map1.size(), 2u); + EXPECT_EQ(map1.size(), 2); EXPECT_EQ(*map1.lookup_ptr(4), 1.0f); } @@ -387,13 +387,13 @@ TEST(map, Clear) map.add(1, 1.0f); map.add(2, 5.0f); - EXPECT_EQ(map.size(), 2u); + EXPECT_EQ(map.size(), 2); EXPECT_TRUE(map.contains(1)); EXPECT_TRUE(map.contains(2)); map.clear(); - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); EXPECT_FALSE(map.contains(1)); EXPECT_FALSE(map.contains(2)); } @@ -425,11 +425,11 @@ TEST(map, Remove) { Map<int, int> map; map.add(2, 4); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_FALSE(map.remove(3)); - EXPECT_EQ(map.size(), 1u); + EXPECT_EQ(map.size(), 1); EXPECT_TRUE(map.remove(2)); - EXPECT_EQ(map.size(), 0u); + EXPECT_EQ(map.size(), 0); } TEST(map, PointerKeys) @@ -441,7 +441,7 @@ TEST(map, PointerKeys) EXPECT_FALSE(map.add(&a, 4)); map.add_new(&b, 1); map.add_new(&c, 1); - EXPECT_EQ(map.size(), 3u); + EXPECT_EQ(map.size(), 3); EXPECT_TRUE(map.remove(&b)); EXPECT_TRUE(map.add(&b, 8)); EXPECT_FALSE(map.remove(&d)); @@ -473,8 +473,8 @@ TEST(map, ForeachItem) values.append(value); }); - EXPECT_EQ(keys.size(), 2u); - EXPECT_EQ(values.size(), 2u); + EXPECT_EQ(keys.size(), 2); + EXPECT_EQ(values.size(), 2); EXPECT_EQ(keys.first_index_of(3), values.first_index_of(4)); EXPECT_EQ(keys.first_index_of(1), values.first_index_of(8)); } @@ -484,11 +484,11 @@ TEST(map, ForeachItem) */ #if 0 template<typename MapT> -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); @@ -520,12 +520,12 @@ BLI_NOINLINE void benchmark_random_ints(StringRef name, uint amount, uint factor TEST(map, Benchmark) { - for (uint i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { benchmark_random_ints<blender::Map<int, int>>("blender::Map ", 1000000, 1); benchmark_random_ints<blender::StdUnorderedMapWrapper<int, int>>("std::unordered_map", 1000000, 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::Map<int, int>>("blender::Map ", 1000000, factor); benchmark_random_ints<blender::StdUnorderedMapWrapper<int, int>>( |