[Bf-blender-cvs] [5d83b597511] functions: splitup tests for set and set_vector

[Jacques Lucke]

Commit: 5d83b59751104116e610640148b52f51435661c3
Author: Jacques Lucke
Date:   Mon Apr 15 14:48:07 2019 +0200
Branches: functions
https://developer.blender.org/rB5d83b59751104116e610640148b52f51435661c3

splitup tests for set and set_vector

===================================================================

A	tests/gtests/blenlib/BLI_small_set_test.cc
M	tests/gtests/blenlib/BLI_small_set_vector_test.cc
M	tests/gtests/blenlib/CMakeLists.txt

===================================================================

diff --git a/tests/gtests/blenlib/BLI_small_set_vector_test.cc b/tests/gtests/blenlib/BLI_small_set_test.cc
similarity index 61%
copy from tests/gtests/blenlib/BLI_small_set_vector_test.cc
copy to tests/gtests/blenlib/BLI_small_set_test.cc
index 0da54f5130a..4a1c98ea965 100644
--- a/tests/gtests/blenlib/BLI_small_set_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_small_set_test.cc
@@ -1,64 +1,5 @@
 #include "testing/testing.h"
-#include "BLI_small_set_vector.hpp"
-
-using IntSetVector = BLI::SmallSetVector<int>;
-
-TEST(small_set_vector, DefaultConstructor)
-{
-	IntSetVector set;
-	EXPECT_EQ(set.size(), 0);
-}
-
-TEST(small_set_vector, InitializerListConstructor_WithoutDuplicates)
-{
-	IntSetVector set = {1, 4, 5};
-	EXPECT_EQ(set.size(), 3);
-	EXPECT_EQ(set[0], 1);
-	EXPECT_EQ(set[1], 4);
-	EXPECT_EQ(set[2], 5);
-}
-
-TEST(small_set_vector, InitializerListConstructor_WithDuplicates)
-{
-	IntSetVector set = {1, 3, 3, 2, 1, 5};
-	EXPECT_EQ(set.size(), 4);
-	EXPECT_EQ(set[0], 1);
-	EXPECT_EQ(set[1], 3);
-	EXPECT_EQ(set[2], 2);
-	EXPECT_EQ(set[3], 5);
-}
-
-TEST(small_set_vector, AddNewIncreasesSize)
-{
-	IntSetVector set;
-	EXPECT_EQ(set.size(), 0);
-	set.add(5);
-	EXPECT_EQ(set.size(), 1);
-}
-
-TEST(small_set_vector, AddExistingDoesNotIncreaseSize)
-{
-	IntSetVector set;
-	EXPECT_EQ(set.size(), 0);
-	set.add(5);
-	EXPECT_EQ(set.size(), 1);
-	set.add(5);
-	EXPECT_EQ(set.size(), 1);
-}
-
-TEST(small_set_vector, IndexOfExisting)
-{
-	IntSetVector set = {3, 6, 4};
-	EXPECT_EQ(set.index(6), 1);
-	EXPECT_EQ(set.index(3), 0);
-	EXPECT_EQ(set.index(4), 2);
-}
-
-TEST(small_set_vector, IndexOfNotExisting)
-{
-	IntSetVector set = {3, 6, 4};
-	EXPECT_EQ(set.index(5), -1);
-}
+#include "BLI_small_set.hpp"
 
 using IntSet = BLI::SmallSet<int>;
 
diff --git a/tests/gtests/blenlib/BLI_small_set_vector_test.cc b/tests/gtests/blenlib/BLI_small_set_vector_test.cc
index 0da54f5130a..b221e1bbaab 100644
--- a/tests/gtests/blenlib/BLI_small_set_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_small_set_vector_test.cc
@@ -59,102 +59,3 @@ TEST(small_set_vector, IndexOfNotExisting)
 	IntSetVector set = {3, 6, 4};
 	EXPECT_EQ(set.index(5), -1);
 }
-
-using IntSet = BLI::SmallSet<int>;
-
-TEST(small_set, Defaultconstructor)
-{
-	IntSet set;
-	EXPECT_EQ(set.size(), 0);
-}
-
-TEST(small_set, ContainsNotExistant)
-{
-	IntSet set;
-	EXPECT_FALSE(set.contains(3));
-}
-
-TEST(small_set, ContainsExistant)
-{
-	IntSet set;
-	EXPECT_FALSE(set.contains(5));
-	set.add(5);
-	EXPECT_TRUE(set.contains(5));
-}
-
-TEST(small_set, AddMany)
-{
-	IntSet set;
-	for (int i = 0; i < 100; i++) {
-		set.add(i);
-	}
-
-	for (int i = 50; i < 100; i++) {
-		EXPECT_TRUE(set.contains(i));
-	}
-	for (int i = 100; i < 150; i++) {
-		EXPECT_FALSE(set.contains(i));
-	}
-}
-
-TEST(small_set, InitializerListConstructor)
-{
-	IntSet set = {4, 5, 6};
-	EXPECT_EQ(set.size(), 3);
-	EXPECT_TRUE(set.contains(4));
-	EXPECT_TRUE(set.contains(5));
-	EXPECT_TRUE(set.contains(6));
-	EXPECT_FALSE(set.contains(2));
-	EXPECT_FALSE(set.contains(3));
-}
-
-TEST(small_set, CopyConstructor)
-{
-	IntSet set = {3};
-	EXPECT_TRUE(set.contains(3));
-	EXPECT_FALSE(set.contains(4));
-
-	IntSet set2 = set;
-	set2.add(4);
-	EXPECT_TRUE(set2.contains(3));
-	EXPECT_TRUE(set2.contains(4));
-
-	EXPECT_FALSE(set.contains(4));
-}
-
-TEST(small_set, MoveConstructor)
-{
-	IntSet set = {1, 2, 3};
-	EXPECT_EQ(set.size(), 3);
-	IntSet set2 = std::move(set);
-	EXPECT_EQ(set.size(), 0);
-	EXPECT_EQ(set2.size(), 3);
-}
-
-TEST(small_set, Pop)
-{
-	IntSet set = {4};
-	EXPECT_EQ(set.size(), 1);
-	EXPECT_EQ(set.pop(), 4);
-	EXPECT_EQ(set.size(), 0);
-}
-
-TEST(small_set, Remove)
-{
-	IntSet set = {3, 4, 5};
-	EXPECT_TRUE(set.contains(3));
-	EXPECT_TRUE(set.contains(4));
-	EXPECT_TRUE(set.contains(5));
-	set.remove(4);
-	EXPECT_TRUE(set.contains(3));
-	EXPECT_FALSE(set.contains(4));
-	EXPECT_TRUE(set.contains(5));
-	set.remove(3);
-	EXPECT_FALSE(set.contains(3));
-	EXPECT_FALSE(set.contains(4));
-	EXPECT_TRUE(set.contains(5));
-	set.remove(5);
-	EXPECT_FALSE(set.contains(3));
-	EXPECT_FALSE(set.contains(4));
-	EXPECT_FALSE(set.contains(5));
-}
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 465ac5e001c..a6720b491a9 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -62,6 +62,7 @@ BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
 BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
 BLENDER_TEST(BLI_shared "bf_blenlib")
 BLENDER_TEST(BLI_small_vector "bf_blenlib")
+BLENDER_TEST(BLI_small_set "bf_blenlib")
 BLENDER_TEST(BLI_small_set_vector "bf_blenlib")
 BLENDER_TEST(BLI_small_stack "bf_blenlib")
 BLENDER_TEST(BLI_small_map "bf_blenlib")