[Bf-blender-cvs] [5a269bfb570] functions: remove "small" from test names
Jacques Lucke
noreply at git.blender.org
Mon Jul 22 18:13:35 CEST 2019
Commit: 5a269bfb5707c4d94148bd334629989cd54b161f
Author: Jacques Lucke
Date: Mon Jul 22 17:19:35 2019 +0200
Branches: functions
https://developer.blender.org/rB5a269bfb5707c4d94148bd334629989cd54b161f
remove "small" from test names
===================================================================
M tests/gtests/blenlib/BLI_map_test.cc
M tests/gtests/blenlib/BLI_set_test.cc
M tests/gtests/blenlib/BLI_set_vector_test.cc
M tests/gtests/blenlib/BLI_stack_cpp_test.cc
M tests/gtests/blenlib/BLI_vector_test.cc
===================================================================
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc
index eb43f8cb1a5..c61372fe41d 100644
--- a/tests/gtests/blenlib/BLI_map_test.cc
+++ b/tests/gtests/blenlib/BLI_map_test.cc
@@ -4,13 +4,13 @@
using IntFloatMap = BLI::Map<int, float>;
-TEST(small_map, DefaultConstructor)
+TEST(map, DefaultConstructor)
{
IntFloatMap map;
EXPECT_EQ(map.size(), 0);
}
-TEST(small_map, AddIncreasesSize)
+TEST(map, AddIncreasesSize)
{
IntFloatMap map;
EXPECT_EQ(map.size(), 0);
@@ -20,7 +20,7 @@ TEST(small_map, AddIncreasesSize)
EXPECT_EQ(map.size(), 2);
}
-TEST(small_map, Contains)
+TEST(map, Contains)
{
IntFloatMap map;
EXPECT_FALSE(map.contains(4));
@@ -30,7 +30,7 @@ TEST(small_map, Contains)
EXPECT_TRUE(map.contains(4));
}
-TEST(small_map, LookupExisting)
+TEST(map, LookupExisting)
{
IntFloatMap map;
map.add(2, 6.0f);
@@ -39,7 +39,7 @@ TEST(small_map, LookupExisting)
EXPECT_EQ(map.lookup(4), 1.0f);
}
-TEST(small_map, LookupNotExisting)
+TEST(map, LookupNotExisting)
{
IntFloatMap map;
map.add(2, 4.0f);
@@ -48,7 +48,7 @@ TEST(small_map, LookupNotExisting)
EXPECT_EQ(map.lookup_ptr(5), nullptr);
}
-TEST(small_map, AddMany)
+TEST(map, AddMany)
{
IntFloatMap map;
for (int i = 0; i < 100; i++) {
@@ -56,7 +56,7 @@ TEST(small_map, AddMany)
}
}
-TEST(small_map, PopItem)
+TEST(map, PopItem)
{
IntFloatMap map;
map.add(2, 3.0f);
@@ -73,7 +73,7 @@ TEST(small_map, PopItem)
EXPECT_FALSE(map.contains(1));
}
-TEST(small_map, PopItemMany)
+TEST(map, PopItemMany)
{
IntFloatMap map;
for (uint i = 0; i < 100; i++) {
@@ -87,7 +87,7 @@ TEST(small_map, PopItemMany)
}
}
-TEST(small_map, LookupRefOrInsert)
+TEST(map, LookupRefOrInsert)
{
IntFloatMap map;
float &value = map.lookup_ref_or_insert(3, 5.0f);
@@ -97,7 +97,7 @@ TEST(small_map, LookupRefOrInsert)
EXPECT_EQ(value, 6.0f);
}
-TEST(small_map, ValueIterator)
+TEST(map, ValueIterator)
{
IntFloatMap map;
map.add(3, 5.0f);
@@ -118,7 +118,7 @@ TEST(small_map, ValueIterator)
EXPECT_TRUE(values.contains(2.0f));
}
-TEST(small_map, KeyIterator)
+TEST(map, KeyIterator)
{
IntFloatMap map;
map.add(6, 3.0f);
@@ -139,7 +139,7 @@ TEST(small_map, KeyIterator)
EXPECT_TRUE(keys.contains(6));
}
-TEST(small_map, ItemIterator)
+TEST(map, ItemIterator)
{
IntFloatMap map;
map.add(5, 3.0f);
@@ -170,14 +170,14 @@ float return_42()
return 42.0f;
}
-TEST(small_map, LookupOrInsertFunc_SeparateFunction)
+TEST(map, LookupOrInsertFunc_SeparateFunction)
{
IntFloatMap map;
EXPECT_EQ(map.lookup_ref_or_insert_func(0, return_42), 42.0f);
EXPECT_EQ(map.lookup(0), 42);
}
-TEST(small_map, LookupOrInsertFunc_Lambdas)
+TEST(map, LookupOrInsertFunc_Lambdas)
{
IntFloatMap map;
auto lambda1 = []() { return 11.0f; };
@@ -189,7 +189,7 @@ TEST(small_map, LookupOrInsertFunc_Lambdas)
EXPECT_EQ(map.lookup_ref_or_insert_func(1, lambda1), 20.0f);
}
-TEST(small_map, InsertOrModify)
+TEST(map, InsertOrModify)
{
IntFloatMap map;
auto create_func = []() { return 10.0f; };
@@ -200,7 +200,7 @@ TEST(small_map, InsertOrModify)
EXPECT_EQ(map.lookup(1), 15.0f);
}
-TEST(small_map, AddOverride)
+TEST(map, AddOverride)
{
IntFloatMap map;
EXPECT_FALSE(map.contains(3));
@@ -212,7 +212,7 @@ TEST(small_map, AddOverride)
EXPECT_EQ(map.lookup(3), 7.0f);
}
-TEST(small_map, MoveConstructorSmall)
+TEST(map, MoveConstructorSmall)
{
IntFloatMap map1;
map1.add(1, 2.0f);
@@ -225,7 +225,7 @@ TEST(small_map, MoveConstructorSmall)
EXPECT_EQ(map1.lookup_ptr(4), nullptr);
}
-TEST(small_map, MoveConstructorLarge)
+TEST(map, MoveConstructorLarge)
{
IntFloatMap map1;
for (uint i = 0; i < 100; i++) {
@@ -239,7 +239,7 @@ TEST(small_map, MoveConstructorLarge)
EXPECT_EQ(map1.lookup_ptr(4), nullptr);
}
-TEST(small_map, MoveAssignment)
+TEST(map, MoveAssignment)
{
IntFloatMap map1;
map1.add(1, 2.0f);
diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/tests/gtests/blenlib/BLI_set_test.cc
index 13fb6e23cfa..16087639b5f 100644
--- a/tests/gtests/blenlib/BLI_set_test.cc
+++ b/tests/gtests/blenlib/BLI_set_test.cc
@@ -3,19 +3,19 @@
using IntSet = BLI::Set<int>;
-TEST(small_set, Defaultconstructor)
+TEST(set, Defaultconstructor)
{
IntSet set;
EXPECT_EQ(set.size(), 0);
}
-TEST(small_set, ContainsNotExistant)
+TEST(set, ContainsNotExistant)
{
IntSet set;
EXPECT_FALSE(set.contains(3));
}
-TEST(small_set, ContainsExistant)
+TEST(set, ContainsExistant)
{
IntSet set;
EXPECT_FALSE(set.contains(5));
@@ -23,7 +23,7 @@ TEST(small_set, ContainsExistant)
EXPECT_TRUE(set.contains(5));
}
-TEST(small_set, AddMany)
+TEST(set, AddMany)
{
IntSet set;
for (int i = 0; i < 100; i++) {
@@ -38,7 +38,7 @@ TEST(small_set, AddMany)
}
}
-TEST(small_set, InitializerListConstructor)
+TEST(set, InitializerListConstructor)
{
IntSet set = {4, 5, 6};
EXPECT_EQ(set.size(), 3);
@@ -49,7 +49,7 @@ TEST(small_set, InitializerListConstructor)
EXPECT_FALSE(set.contains(3));
}
-TEST(small_set, CopyConstructor)
+TEST(set, CopyConstructor)
{
IntSet set = {3};
EXPECT_TRUE(set.contains(3));
@@ -63,7 +63,7 @@ TEST(small_set, CopyConstructor)
EXPECT_FALSE(set.contains(4));
}
-TEST(small_set, MoveConstructor)
+TEST(set, MoveConstructor)
{
IntSet set = {1, 2, 3};
EXPECT_EQ(set.size(), 3);
@@ -72,7 +72,7 @@ TEST(small_set, MoveConstructor)
EXPECT_EQ(set2.size(), 3);
}
-TEST(small_set, Pop)
+TEST(set, Pop)
{
IntSet set = {4};
EXPECT_EQ(set.size(), 1);
@@ -80,7 +80,7 @@ TEST(small_set, Pop)
EXPECT_EQ(set.size(), 0);
}
-TEST(small_set, Remove)
+TEST(set, Remove)
{
IntSet set = {3, 4, 5};
EXPECT_TRUE(set.contains(3));
@@ -100,7 +100,7 @@ TEST(small_set, Remove)
EXPECT_FALSE(set.contains(5));
}
-TEST(small_set, RemoveMany)
+TEST(set, RemoveMany)
{
IntSet set;
for (uint i = 0; i < 1000; i++) {
@@ -123,7 +123,7 @@ TEST(small_set, RemoveMany)
}
}
-TEST(small_set, Intersects)
+TEST(set, Intersects)
{
IntSet a = {3, 4, 5, 6};
IntSet b = {1, 2, 5};
@@ -131,7 +131,7 @@ TEST(small_set, Intersects)
EXPECT_FALSE(IntSet::Disjoint(a, b));
}
-TEST(small_set, Disjoint)
+TEST(set, Disjoint)
{
IntSet a = {5, 6, 7, 8};
IntSet b = {2, 3, 4, 9};
@@ -139,7 +139,7 @@ TEST(small_set, Disjoint)
EXPECT_TRUE(IntSet::Disjoint(a, b));
}
-TEST(small_set, AddMultiple)
+TEST(set, AddMultiple)
{
IntSet a;
a.add_multiple({5, 7});
@@ -152,7 +152,7 @@ TEST(small_set, AddMultiple)
EXPECT_EQ(a.size(), 4);
}
-TEST(small_set, AddMultipleNew)
+TEST(set, AddMultipleNew)
{
IntSet a;
a.add_multiple_new({5, 6});
@@ -160,7 +160,7 @@ TEST(small_set, AddMultipleNew)
EXPECT_TRUE(a.contains(6));
}
-TEST(small_set, ToSmallVector)
+TEST(set, ToSmallVector)
{
IntSet a = {5, 2, 8};
BLI::Vector<int> vec = a.to_small_vector();
diff --git a/tests/gtests/blenlib/BLI_set_vector_test.cc b/tests/gtests/blenlib/BLI_set_vector_test.cc
index 3036dee1e8c..048dcee7a96 100644
--- a/tests/gtests/blenlib/BLI_set_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_set_vector_test.cc
@@ -3,13 +3,13 @@
using IntSetVector = BLI::SetVector<int>;
-TEST(small_set_vector, DefaultConstructor)
+TEST(set_vector, DefaultConstructor)
{
IntSetVector set;
EXPECT_EQ(set.size(), 0);
}
-TEST(small_set_vector, InitializerListConstructor_WithoutDuplicates)
+TEST(set_vector, InitializerListConstructor_WithoutDuplicates)
{
IntSetVector set = {1, 4, 5};
EXPECT_EQ(set.size(), 3);
@@ -18,7 +18,7 @@ TEST(small_set_vector, InitializerListConstructor_WithoutDuplicates)
EXPECT_EQ(set[2], 5);
}
-TEST(small_set_vector, InitializerListConstructor_WithDuplicates)
+TEST(set_vector, InitializerListConstructor_WithDuplicates)
{
IntSetVector set = {1, 3, 3, 2, 1, 5};
EXPECT_EQ(set.size(), 4);
@@ -28,7 +28,7 @@ TEST(small_set_vector, InitializerListConstructor_WithDuplicates)
EXPECT_EQ(set[3], 5);
}
-TEST(small_set_vector, AddNewIncreasesSize)
+TEST(set_vector, AddNewIncreasesSize)
{
IntSetVector set;
EXPECT_EQ(set.size(), 0);
@@ -36,7 +36,7 @@ TEST(small_set_vector, AddNewIncreasesSize)
EXPECT_EQ(set.size(), 1);
}
-TEST(small_set_vector, AddExistingDoesNotIncreaseSize)
+TEST(set_vector, AddExistingDoesNotIncreaseSize)
{
IntSetVector set;
EXPECT_EQ(set.size(), 0);
@@ -46,7 +46,7 @@ TEST(small_set_vector, AddExistingDoesNotIncreaseSize)
EXPECT_EQ(set.size(), 1);
}
-TEST(small_set_vector, IndexOfExisting)
+TEST(set_vector, IndexOfExisting)
{
IntSetVector set = {3, 6, 4};
EXPECT_EQ(set.index(6), 1);
@@ -54,7 +54,7 @@ TEST(small_set_vector, IndexOfExisting)
EXPECT_EQ(set.index(4), 2);
}
-TEST(small_set_vector, IndexOfNotExisting)
+TEST(set_vector, IndexOfNotExisting)
{
IntSetVector set = {3, 6, 4};
EXPECT_EQ(set.index(5), -1);
diff --git a/tests/gtests/blenlib/BLI_stack_cpp_test.cc b/tests/gtests/blenlib/BLI_stack_cpp_test.cc
index 6de876f98d1..b5ae3667ec9 100644
--- a/tests/gtests/blenlib/BLI_stack_cpp_test.cc
+++ b/tests/gtests/blenlib/BLI_stack_cpp_test.cc
@@ -3,14 +3,14 @@
using IntStack = BLI::Stack<int>;
-TEST(small_stack, DefaultConstructor)
+TEST(stack, DefaultConstructor)
{
IntStack stack;
EXPECT_EQ(stack.size(), 0);
EXPECT_TRUE(stack.empty());
}
-TEST(small_stack, ArrayRefConstructor)
+TEST(stack, ArrayRefConstructor)
{
std::array<int, 3> array = {4, 7, 2};
IntStack stack(array);
@@ -21,7 +21,7 @@ TEST(small_stack, ArrayRefConstructor)
EXPECT_TRUE(stack.empty());
}
-TEST(small_stack, Push)
+TEST(stack, Push)
{
IntStack stack;
EXPECT_EQ(stack.size(), 0);
@@ -31,7 +31,7 @@ TEST(small_stack, Push)
EXPECT_EQ(stack.size(), 2);
}
-TEST(small_stack, Pop)
+TEST(stack, Pop)
{
IntStack stack;
stack.push(4);
@@ -40,7 +40,7 @@ TEST(small_stack, Pop)
EXPECT_EQ(stack.pop(), 4);
}
-TEST(small_stack, Peek)
+TEST(stack, Peek)
{
IntStack stack;
stack.push(3);
diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc
index b0b4a2ae147..38eada82d70 100644
--- a/tests/gtests/blenlib/BLI_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_vector_test.cc
@@ -7,13 +7,13 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list