diff options
Diffstat (limited to 'tests/gtests/blenlib/BLI_vector_test.cc')
-rw-r--r-- | tests/gtests/blenlib/BLI_vector_test.cc | 156 |
1 files changed, 60 insertions, 96 deletions
diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc index 25435739a43..b203970ff8e 100644 --- a/tests/gtests/blenlib/BLI_vector_test.cc +++ b/tests/gtests/blenlib/BLI_vector_test.cc @@ -10,13 +10,13 @@ namespace blender { TEST(vector, DefaultConstructor) { Vector<int> vec; - EXPECT_EQ(vec.size(), 0u); + EXPECT_EQ(vec.size(), 0); } TEST(vector, SizeConstructor) { Vector<int> vec(3); - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); } /** @@ -42,7 +42,7 @@ TEST(vector, TrivialTypeSizeConstructor) TEST(vector, SizeValueConstructor) { Vector<int> vec(4, 10); - EXPECT_EQ(vec.size(), 4u); + EXPECT_EQ(vec.size(), 4); EXPECT_EQ(vec[0], 10); EXPECT_EQ(vec[1], 10); EXPECT_EQ(vec[2], 10); @@ -52,7 +52,7 @@ TEST(vector, SizeValueConstructor) TEST(vector, InitializerListConstructor) { Vector<int> vec = {1, 3, 4, 6}; - EXPECT_EQ(vec.size(), 4u); + EXPECT_EQ(vec.size(), 4); EXPECT_EQ(vec[0], 1); EXPECT_EQ(vec[1], 3); EXPECT_EQ(vec[2], 4); @@ -63,7 +63,7 @@ TEST(vector, ConvertingConstructor) { std::array<float, 5> values = {5.4f, 7.3f, -8.1f, 5.0f, 0.0f}; Vector<int> vec = values; - EXPECT_EQ(vec.size(), 5u); + EXPECT_EQ(vec.size(), 5); EXPECT_EQ(vec[0], 5); EXPECT_EQ(vec[1], 7); EXPECT_EQ(vec[2], -8); @@ -88,7 +88,7 @@ TEST(vector, ListBaseConstructor) BLI_addtail(&list, value3); Vector<TestListValue *> vec(list); - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); EXPECT_EQ(vec[0]->value, 4); EXPECT_EQ(vec[1]->value, 5); EXPECT_EQ(vec[2]->value, 6); @@ -106,7 +106,7 @@ TEST(vector, ContainerConstructor) list.push_front(5); Vector<int> vec = Vector<int>::FromContainer(list); - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); EXPECT_EQ(vec[0], 5); EXPECT_EQ(vec[1], 1); EXPECT_EQ(vec[2], 3); @@ -116,7 +116,7 @@ TEST(vector, CopyConstructor) { Vector<int> vec1 = {1, 2, 3}; Vector<int> vec2(vec1); - EXPECT_EQ(vec2.size(), 3u); + EXPECT_EQ(vec2.size(), 3); EXPECT_EQ(vec2[0], 1); EXPECT_EQ(vec2[1], 2); EXPECT_EQ(vec2[2], 3); @@ -131,8 +131,8 @@ TEST(vector, CopyConstructor2) Vector<int, 2> vec1 = {1, 2, 3, 4}; Vector<int, 3> vec2(vec1); - EXPECT_EQ(vec1.size(), 4u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 4); + EXPECT_EQ(vec2.size(), 4); EXPECT_NE(vec1.data(), vec2.data()); EXPECT_EQ(vec2[0], 1); EXPECT_EQ(vec2[1], 2); @@ -145,8 +145,8 @@ TEST(vector, CopyConstructor3) Vector<int, 20> vec1 = {1, 2, 3, 4}; Vector<int, 1> vec2(vec1); - EXPECT_EQ(vec1.size(), 4u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 4); + EXPECT_EQ(vec2.size(), 4); EXPECT_NE(vec1.data(), vec2.data()); EXPECT_EQ(vec2[2], 3); } @@ -156,8 +156,8 @@ TEST(vector, CopyConstructor4) Vector<int, 5> vec1 = {1, 2, 3, 4}; Vector<int, 6> vec2(vec1); - EXPECT_EQ(vec1.size(), 4u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 4); + EXPECT_EQ(vec2.size(), 4); EXPECT_NE(vec1.data(), vec2.data()); EXPECT_EQ(vec2[3], 4); } @@ -167,8 +167,8 @@ TEST(vector, MoveConstructor) Vector<int> vec1 = {1, 2, 3, 4}; Vector<int> vec2(std::move(vec1)); - EXPECT_EQ(vec1.size(), 0u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 0); + EXPECT_EQ(vec2.size(), 4); EXPECT_EQ(vec2[0], 1); EXPECT_EQ(vec2[1], 2); EXPECT_EQ(vec2[2], 3); @@ -180,8 +180,8 @@ TEST(vector, MoveConstructor2) Vector<int, 2> vec1 = {1, 2, 3, 4}; Vector<int, 3> vec2(std::move(vec1)); - EXPECT_EQ(vec1.size(), 0u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 0); + EXPECT_EQ(vec2.size(), 4); EXPECT_EQ(vec2[0], 1); EXPECT_EQ(vec2[1], 2); EXPECT_EQ(vec2[2], 3); @@ -193,8 +193,8 @@ TEST(vector, MoveConstructor3) Vector<int, 20> vec1 = {1, 2, 3, 4}; Vector<int, 1> vec2(std::move(vec1)); - EXPECT_EQ(vec1.size(), 0u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 0); + EXPECT_EQ(vec2.size(), 4); EXPECT_EQ(vec2[2], 3); } @@ -203,20 +203,20 @@ TEST(vector, MoveConstructor4) Vector<int, 5> vec1 = {1, 2, 3, 4}; Vector<int, 6> vec2(std::move(vec1)); - EXPECT_EQ(vec1.size(), 0u); - EXPECT_EQ(vec2.size(), 4u); + EXPECT_EQ(vec1.size(), 0); + EXPECT_EQ(vec2.size(), 4); EXPECT_EQ(vec2[3], 4); } TEST(vector, MoveAssignment) { Vector<int> vec = {1, 2}; - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); EXPECT_EQ(vec[0], 1); EXPECT_EQ(vec[1], 2); vec = Vector<int>({5}); - EXPECT_EQ(vec.size(), 1u); + EXPECT_EQ(vec.size(), 1); EXPECT_EQ(vec[0], 5); } @@ -224,11 +224,11 @@ TEST(vector, CopyAssignment) { Vector<int> vec1 = {1, 2, 3}; Vector<int> vec2 = {4, 5}; - EXPECT_EQ(vec1.size(), 3u); - EXPECT_EQ(vec2.size(), 2u); + EXPECT_EQ(vec1.size(), 3); + EXPECT_EQ(vec2.size(), 2); vec2 = vec1; - EXPECT_EQ(vec2.size(), 3u); + EXPECT_EQ(vec2.size(), 3); vec1[0] = 7; EXPECT_EQ(vec1[0], 7); @@ -241,7 +241,7 @@ TEST(vector, Append) vec.append(3); vec.append(6); vec.append(7); - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); EXPECT_EQ(vec[0], 3); EXPECT_EQ(vec[1], 6); EXPECT_EQ(vec[2], 7); @@ -250,56 +250,33 @@ TEST(vector, Append) TEST(vector, AppendAndGetIndex) { Vector<int> vec; - EXPECT_EQ(vec.append_and_get_index(10), 0u); - EXPECT_EQ(vec.append_and_get_index(10), 1u); - EXPECT_EQ(vec.append_and_get_index(10), 2u); + EXPECT_EQ(vec.append_and_get_index(10), 0); + EXPECT_EQ(vec.append_and_get_index(10), 1); + EXPECT_EQ(vec.append_and_get_index(10), 2); vec.append(10); - EXPECT_EQ(vec.append_and_get_index(10), 4u); + EXPECT_EQ(vec.append_and_get_index(10), 4); } TEST(vector, AppendNonDuplicates) { Vector<int> vec; vec.append_non_duplicates(4); - EXPECT_EQ(vec.size(), 1u); + EXPECT_EQ(vec.size(), 1); vec.append_non_duplicates(5); - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); vec.append_non_duplicates(4); - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); } TEST(vector, ExtendNonDuplicates) { Vector<int> vec; vec.extend_non_duplicates({1, 2}); - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); vec.extend_non_duplicates({3, 4}); - EXPECT_EQ(vec.size(), 4u); + EXPECT_EQ(vec.size(), 4); vec.extend_non_duplicates({0, 1, 2, 3}); - EXPECT_EQ(vec.size(), 5u); -} - -TEST(vector, Fill) -{ - Vector<int> vec(5); - vec.fill(3); - EXPECT_EQ(vec.size(), 5u); - EXPECT_EQ(vec[0], 3); - EXPECT_EQ(vec[1], 3); - EXPECT_EQ(vec[2], 3); - EXPECT_EQ(vec[3], 3); - EXPECT_EQ(vec[4], 3); -} - -TEST(vector, FillIndices) -{ - Vector<int> vec(5, 0); - vec.fill_indices({1, 2}, 4); - EXPECT_EQ(vec[0], 0); - EXPECT_EQ(vec[1], 4); - EXPECT_EQ(vec[2], 4); - EXPECT_EQ(vec[3], 0); - EXPECT_EQ(vec[4], 0); + EXPECT_EQ(vec.size(), 5); } TEST(vector, Iterator) @@ -318,8 +295,8 @@ TEST(vector, BecomeLarge) for (int i = 0; i < 100; i++) { vec.append(i * 5); } - EXPECT_EQ(vec.size(), 100u); - for (uint i = 0; i < 100; i++) { + EXPECT_EQ(vec.size(), 100); + for (int i = 0; i < 100; i++) { EXPECT_EQ(vec[i], static_cast<int>(i * 5)); } } @@ -332,7 +309,7 @@ static Vector<int> return_by_value_helper() TEST(vector, ReturnByValue) { Vector<int> vec = return_by_value_helper(); - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); EXPECT_EQ(vec[0], 3); EXPECT_EQ(vec[1], 5); EXPECT_EQ(vec[2], 1); @@ -341,39 +318,26 @@ TEST(vector, ReturnByValue) TEST(vector, VectorOfVectors_Append) { Vector<Vector<int>> vec; - EXPECT_EQ(vec.size(), 0u); + EXPECT_EQ(vec.size(), 0); Vector<int> v({1, 2}); vec.append(v); vec.append({7, 8}); - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); EXPECT_EQ(vec[0][0], 1); EXPECT_EQ(vec[0][1], 2); EXPECT_EQ(vec[1][0], 7); EXPECT_EQ(vec[1][1], 8); } -TEST(vector, VectorOfVectors_Fill) -{ - Vector<Vector<int>> vec(3); - vec.fill({4, 5}); - - EXPECT_EQ(vec[0][0], 4); - EXPECT_EQ(vec[0][1], 5); - EXPECT_EQ(vec[1][0], 4); - EXPECT_EQ(vec[1][1], 5); - EXPECT_EQ(vec[2][0], 4); - EXPECT_EQ(vec[2][1], 5); -} - TEST(vector, RemoveLast) { Vector<int> vec = {5, 6}; - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); vec.remove_last(); - EXPECT_EQ(vec.size(), 1u); + EXPECT_EQ(vec.size(), 1); vec.remove_last(); - EXPECT_EQ(vec.size(), 0u); + EXPECT_EQ(vec.size(), 0); } TEST(vector, IsEmpty) @@ -415,7 +379,7 @@ TEST(vector, RemoveFirstOccurrenceAndReorder) vec.remove_first_occurrence_and_reorder(4); EXPECT_EQ(vec[0], 7); vec.remove_first_occurrence_and_reorder(7); - EXPECT_EQ(vec.size(), 0u); + EXPECT_EQ(vec.size(), 0); } TEST(vector, Remove) @@ -440,7 +404,7 @@ TEST(vector, ExtendSmallVector) Vector<int> a = {2, 3, 4}; Vector<int> b = {11, 12}; b.extend(a); - EXPECT_EQ(b.size(), 5u); + EXPECT_EQ(b.size(), 5); EXPECT_EQ(b[0], 11); EXPECT_EQ(b[1], 12); EXPECT_EQ(b[2], 2); @@ -455,7 +419,7 @@ TEST(vector, ExtendArray) Vector<int> a; a.extend(array, 2); - EXPECT_EQ(a.size(), 2u); + EXPECT_EQ(a.size(), 2); EXPECT_EQ(a[0], 3); EXPECT_EQ(a[1], 4); } @@ -471,7 +435,7 @@ TEST(vector, AppendNTimes) Vector<int> a; a.append_n_times(5, 3); a.append_n_times(2, 2); - EXPECT_EQ(a.size(), 5u); + EXPECT_EQ(a.size(), 5); EXPECT_EQ(a[0], 5); EXPECT_EQ(a[1], 5); EXPECT_EQ(a[2], 5); @@ -486,13 +450,13 @@ TEST(vector, UniquePtrValue) vec.append(std::unique_ptr<int>(new int())); vec.append(std::unique_ptr<int>(new int())); vec.append(std::unique_ptr<int>(new int())); - EXPECT_EQ(vec.size(), 4u); + EXPECT_EQ(vec.size(), 4); std::unique_ptr<int> &a = vec.last(); std::unique_ptr<int> b = vec.pop_last(); vec.remove_and_reorder(0); vec.remove(0); - EXPECT_EQ(vec.size(), 1u); + EXPECT_EQ(vec.size(), 1); UNUSED_VARS(a, b); } @@ -607,29 +571,29 @@ TEST(vector, Resize) { std::string long_string = "012345678901234567890123456789"; Vector<std::string> vec; - EXPECT_EQ(vec.size(), 0u); + EXPECT_EQ(vec.size(), 0); vec.resize(2); - EXPECT_EQ(vec.size(), 2u); + EXPECT_EQ(vec.size(), 2); EXPECT_EQ(vec[0], ""); EXPECT_EQ(vec[1], ""); vec.resize(5, long_string); - EXPECT_EQ(vec.size(), 5u); + EXPECT_EQ(vec.size(), 5); EXPECT_EQ(vec[0], ""); EXPECT_EQ(vec[1], ""); EXPECT_EQ(vec[2], long_string); EXPECT_EQ(vec[3], long_string); EXPECT_EQ(vec[4], long_string); vec.resize(1); - EXPECT_EQ(vec.size(), 1u); + EXPECT_EQ(vec.size(), 1); EXPECT_EQ(vec[0], ""); } TEST(vector, FirstIndexOf) { Vector<int> vec = {2, 3, 5, 7, 5, 9}; - EXPECT_EQ(vec.first_index_of(2), 0u); - EXPECT_EQ(vec.first_index_of(5), 2u); - EXPECT_EQ(vec.first_index_of(9), 5u); + EXPECT_EQ(vec.first_index_of(2), 0); + EXPECT_EQ(vec.first_index_of(5), 2); + EXPECT_EQ(vec.first_index_of(9), 5); } TEST(vector, FirstIndexTryOf) @@ -657,7 +621,7 @@ TEST(vector, ConstructVoidPointerVector) float b; double c; Vector<void *> vec = {&a, &b, &c}; - EXPECT_EQ(vec.size(), 3u); + EXPECT_EQ(vec.size(), 3); } } // namespace blender |