[Bf-blender-cvs] [9b8eb41] master: GTests: split array_utils tests

[Campbell Barton]

Commit: 9b8eb4156782287811705b4253329b9173699580
Author: Campbell Barton
Date:   Tue Jan 19 19:54:17 2016 +1100
Branches: master
https://developer.blender.org/rB9b8eb4156782287811705b4253329b9173699580

GTests: split array_utils tests

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

M	tests/gtests/blenlib/BLI_array_utils_test.cc

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

diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc
index 2a1c183..596c397 100644
--- a/tests/gtests/blenlib/BLI_array_utils_test.cc
+++ b/tests/gtests/blenlib/BLI_array_utils_test.cc
@@ -11,90 +11,91 @@ extern "C" {
 /* tests */
 
 /* BLI_array_reverse */
-TEST(array_utils, Reverse)
+TEST(array_utils, ReverseStringEmpty)
 {
-	{
-		char data[] = "";
-		BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
-		EXPECT_STREQ("", data);
-	}
-
-	{
-		char data[] = "0";
-		BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
-		EXPECT_STREQ("0", data);
-	}
-
-	{
-		char data[] = "0123";
-		BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
-		EXPECT_STREQ("3210", data);
-	}
-
-	{
-		const std::vector<int> data_cmp  = {3, 2, 1, 0};
-		std::vector<int> data            = {0, 1, 2, 3};
-		BLI_array_reverse(data.data(), data.size());
-		EXPECT_EQ(data, data_cmp);
-	}
+	char data[] = "";
+	BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
+	EXPECT_STREQ("", data);
+}
+
+TEST(array_utils, ReverseStringSingle)
+{
+	char data[] = "0";
+	BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
+	EXPECT_STREQ("0", data);
+}
+
+TEST(array_utils, ReverseString4)
+{
+	char data[] = "0123";
+	BLI_array_reverse(data, ARRAY_SIZE(data) - 1);
+	EXPECT_STREQ("3210", data);
+}
+
+TEST(array_utils, ReverseInt4)
+{
+	const std::vector<int> data_cmp  = {3, 2, 1, 0};
+	std::vector<int> data            = {0, 1, 2, 3};
+	BLI_array_reverse(data.data(), data.size());
+	EXPECT_EQ(data, data_cmp);
 }
 
 /* BLI_array_findindex */
-TEST(array_utils, FindIndex)
+TEST(array_utils, FindIndexStringEmpty)
 {
-	{
-		char data[] = "", find = '0';
-		EXPECT_EQ(-1, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
-	}
-
-	{
-		char data[] = "0", find = '0';
-		EXPECT_EQ(0, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
-	}
-
-	{
-		char data[] = "1", find = '0';
-		EXPECT_EQ(-1, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
-	}
-
-	{
-		char data[] = "0123", find = '3';
-		EXPECT_EQ(3, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
-	}
-
-	{
-		int data[] = {0, 1, 2, 3}, find = 2;
-		EXPECT_EQ(2, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
-	}
+	char data[] = "", find = '0';
+	EXPECT_EQ(-1, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
 }
 
-/* BLI_array_binary_and */
-TEST(array_utils, BinaryAnd)
+TEST(array_utils, FindIndexStringSingle)
 {
+	char data[] = "0", find = '0';
+	EXPECT_EQ(0, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
+}
+
+TEST(array_utils, FindIndexStringSingleMissing)
+{
+	char data[] = "1", find = '0';
+	EXPECT_EQ(-1, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
+}
+
+TEST(array_utils, FindIndexString4)
+{
+	char data[] = "0123", find = '3';
+	EXPECT_EQ(3, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
+}
+
+TEST(array_utils, FindIndexInt4)
+{
+	int data[] = {0, 1, 2, 3}, find = 2;
+	EXPECT_EQ(2, BLI_array_findindex(data, ARRAY_SIZE(data) - 1, &find));
+}
+
+/* BLI_array_binary_and */
 #define BINARY_AND_TEST(data_cmp, data_a, data_b, data_combine) \
-	{ \
-		data_combine.resize(data_cmp.size()); \
-		BLI_array_binary_and(data_combine.data(), data_a.data(), data_b.data(), data_cmp.size()); \
-		EXPECT_EQ(data_combine, data_cmp); \
-	} ((void)0)
+{ \
+	data_combine.resize(data_cmp.size()); \
+	BLI_array_binary_and(data_combine.data(), data_a.data(), data_b.data(), data_cmp.size()); \
+	EXPECT_EQ(data_combine, data_cmp); \
+} ((void)0)
 
-	{
-		std::vector<int> data_a = {0, 1, 0, 1}, data_b = {1, 0, 1, 0}, data_cmp = {0, 0, 0, 0};
-		std::vector<int> data_combine;
-		BINARY_AND_TEST(data_cmp, data_a, data_b, data_combine);
-	}
-
-	{
-		std::vector<int> data_a = {1, 1, 1, 1}, data_b = {1, 0, 1, 0}, data_cmp = {1, 0, 1, 0};
-		std::vector<int> data_combine;
-		BINARY_AND_TEST(data_cmp, data_a, data_b, data_combine);
-	}
-#undef BINARY_AND_TEST
+TEST(array_utils, BinaryAndInt4Zero)
+{
+	std::vector<int> data_a = {0, 1, 0, 1}, data_b = {1, 0, 1, 0}, data_cmp = {0, 0, 0, 0};
+	std::vector<int> data_combine;
+	BINARY_AND_TEST(data_cmp, data_a, data_b, data_combine);
 }
 
-/* BLI_array_binary_or */
-TEST(array_utils, BinaryOr)
+TEST(array_utils, BinaryAndInt4Mix)
 {
+	std::vector<int> data_a = {1, 1, 1, 1}, data_b = {1, 0, 1, 0}, data_cmp = {1, 0, 1, 0};
+	std::vector<int> data_combine;
+	BINARY_AND_TEST(data_cmp, data_a, data_b, data_combine);
+}
+#undef BINARY_AND_TEST
+
+
+/* BLI_array_binary_or */
 #define BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine) \
 	{ \
 		data_combine.resize(data_cmp.size()); \
@@ -102,16 +103,18 @@ TEST(array_utils, BinaryOr)
 		EXPECT_EQ(data_combine, data_cmp); \
 	} ((void)0)
 
-	{
-		std::vector<int> data_a = {0, 1, 0, 1}, data_b = {1, 0, 1, 0}, data_cmp = {1, 1, 1, 1};
-		std::vector<int> data_combine;
-		BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine);
-	}
-
-	{
-		std::vector<int> data_a = {1, 1, 0, 0}, data_b = {0, 0, 1, 0}, data_cmp = {1, 1, 1, 0};
-		std::vector<int> data_combine;
-		BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine);
-	}
-#undef BINARY_OR_TEST
+TEST(array_utils, BinaryOrInt4Alternate)
+{
+	std::vector<int> data_a = {0, 1, 0, 1}, data_b = {1, 0, 1, 0}, data_cmp = {1, 1, 1, 1};
+	std::vector<int> data_combine;
+	BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine);
 }
+
+TEST(array_utils, BinaryOrInt4Mix)
+{
+	std::vector<int> data_a = {1, 1, 0, 0}, data_b = {0, 0, 1, 0}, data_cmp = {1, 1, 1, 0};
+	std::vector<int> data_combine;
+	BINARY_OR_TEST(data_cmp, data_a, data_b, data_combine);
+}
+#undef BINARY_OR_TEST
+