1 files changed, 31 insertions, 29 deletions

diff --git a/tests/gtests/blenlib/BLI_vector_set_test.cc b/tests/gtests/blenlib/BLI_vector_set_test.cc
index 1f8a830d134..982081f4b4c 100644
--- a/tests/gtests/blenlib/BLI_vector_set_test.cc
+++ b/tests/gtests/blenlib/BLI_vector_set_test.cc
@@ -2,19 +2,19 @@
 #include "BLI_vector_set.hh"
 #include "testing/testing.h"
 
-using blender::VectorSet;
+namespace blender {
 
 TEST(vector_set, DefaultConstructor)
 {
   VectorSet<int> set;
-  EXPECT_EQ(set.size(), 0);
+  EXPECT_EQ(set.size(), 0u);
   EXPECT_TRUE(set.is_empty());
 }
 
 TEST(vector_set, InitializerListConstructor_WithoutDuplicates)
 {
   VectorSet<int> set = {1, 4, 5};
-  EXPECT_EQ(set.size(), 3);
+  EXPECT_EQ(set.size(), 3u);
   EXPECT_EQ(set[0], 1);
   EXPECT_EQ(set[1], 4);
   EXPECT_EQ(set[2], 5);
@@ -23,7 +23,7 @@ TEST(vector_set, InitializerListConstructor_WithoutDuplicates)
 TEST(vector_set, InitializerListConstructor_WithDuplicates)
 {
   VectorSet<int> set = {1, 3, 3, 2, 1, 5};
-  EXPECT_EQ(set.size(), 4);
+  EXPECT_EQ(set.size(), 4u);
   EXPECT_EQ(set[0], 1);
   EXPECT_EQ(set[1], 3);
   EXPECT_EQ(set[2], 2);
@@ -34,10 +34,10 @@ TEST(vector_set, Copy)
 {
   VectorSet<int> set1 = {1, 2, 3};
   VectorSet<int> set2 = set1;
-  EXPECT_EQ(set1.size(), 3);
-  EXPECT_EQ(set2.size(), 3);
-  EXPECT_EQ(set1.index_of(2), 1);
-  EXPECT_EQ(set2.index_of(2), 1);
+  EXPECT_EQ(set1.size(), 3u);
+  EXPECT_EQ(set2.size(), 3u);
+  EXPECT_EQ(set1.index_of(2), 1u);
+  EXPECT_EQ(set2.index_of(2), 1u);
 }
 
 TEST(vector_set, CopyAssignment)
@@ -45,18 +45,18 @@ TEST(vector_set, CopyAssignment)
   VectorSet<int> set1 = {1, 2, 3};
   VectorSet<int> set2 = {};
   set2 = set1;
-  EXPECT_EQ(set1.size(), 3);
-  EXPECT_EQ(set2.size(), 3);
-  EXPECT_EQ(set1.index_of(2), 1);
-  EXPECT_EQ(set2.index_of(2), 1);
+  EXPECT_EQ(set1.size(), 3u);
+  EXPECT_EQ(set2.size(), 3u);
+  EXPECT_EQ(set1.index_of(2), 1u);
+  EXPECT_EQ(set2.index_of(2), 1u);
 }
 
 TEST(vector_set, Move)
 {
   VectorSet<int> set1 = {1, 2, 3};
   VectorSet<int> set2 = std::move(set1);
-  EXPECT_EQ(set1.size(), 0);
-  EXPECT_EQ(set2.size(), 3);
+  EXPECT_EQ(set1.size(), 0u);
+  EXPECT_EQ(set2.size(), 3u);
 }
 
 TEST(vector_set, MoveAssignment)
@@ -64,36 +64,36 @@ TEST(vector_set, MoveAssignment)
   VectorSet<int> set1 = {1, 2, 3};
   VectorSet<int> set2 = {};
   set2 = std::move(set1);
-  EXPECT_EQ(set1.size(), 0);
-  EXPECT_EQ(set2.size(), 3);
+  EXPECT_EQ(set1.size(), 0u);
+  EXPECT_EQ(set2.size(), 3u);
 }
 
 TEST(vector_set, AddNewIncreasesSize)
 {
   VectorSet<int> set;
   EXPECT_TRUE(set.is_empty());
-  EXPECT_EQ(set.size(), 0);
+  EXPECT_EQ(set.size(), 0u);
   set.add(5);
   EXPECT_FALSE(set.is_empty());
-  EXPECT_EQ(set.size(), 1);
+  EXPECT_EQ(set.size(), 1u);
 }
 
 TEST(vector_set, AddExistingDoesNotIncreaseSize)
 {
   VectorSet<int> set;
-  EXPECT_EQ(set.size(), 0);
+  EXPECT_EQ(set.size(), 0u);
   EXPECT_TRUE(set.add(5));
-  EXPECT_EQ(set.size(), 1);
+  EXPECT_EQ(set.size(), 1u);
   EXPECT_FALSE(set.add(5));
-  EXPECT_EQ(set.size(), 1);
+  EXPECT_EQ(set.size(), 1u);
 }
 
 TEST(vector_set, Index)
 {
   VectorSet<int> set = {3, 6, 4};
-  EXPECT_EQ(set.index_of(6), 1);
-  EXPECT_EQ(set.index_of(3), 0);
-  EXPECT_EQ(set.index_of(4), 2);
+  EXPECT_EQ(set.index_of(6), 1u);
+  EXPECT_EQ(set.index_of(3), 0u);
+  EXPECT_EQ(set.index_of(4), 2u);
 }
 
 TEST(vector_set, IndexTry)
@@ -108,21 +108,21 @@ TEST(vector_set, IndexTry)
 TEST(vector_set, RemoveContained)
 {
   VectorSet<int> set = {4, 5, 6, 7};
-  EXPECT_EQ(set.size(), 4);
+  EXPECT_EQ(set.size(), 4u);
   set.remove_contained(5);
-  EXPECT_EQ(set.size(), 3);
+  EXPECT_EQ(set.size(), 3u);
   EXPECT_EQ(set[0], 4);
   EXPECT_EQ(set[1], 7);
   EXPECT_EQ(set[2], 6);
   set.remove_contained(6);
-  EXPECT_EQ(set.size(), 2);
+  EXPECT_EQ(set.size(), 2u);
   EXPECT_EQ(set[0], 4);
   EXPECT_EQ(set[1], 7);
   set.remove_contained(4);
-  EXPECT_EQ(set.size(), 1);
+  EXPECT_EQ(set.size(), 1u);
   EXPECT_EQ(set[0], 7);
   set.remove_contained(7);
-  EXPECT_EQ(set.size(), 0);
+  EXPECT_EQ(set.size(), 0u);
 }
 
 TEST(vector_set, AddMultipleTimes)
@@ -158,3 +158,5 @@ TEST(vector_set, Remove)
   EXPECT_FALSE(set.remove(5));
   EXPECT_FALSE(set.contains(5));
 }
+
+}  // namespace blender