[Bf-blender-cvs] [dc1b45ff1a] master: Tests: Use EXPECT_TRUE() instead of EXPECT_EQ(foo, true)

[Sergey Sharybin]

Commit: dc1b45ff1a96ee1ce8cb76ebf6ead7490bc1af26
Author: Sergey Sharybin
Date:   Fri Feb 3 11:51:01 2017 +0100
Branches: master
https://developer.blender.org/rBdc1b45ff1a96ee1ce8cb76ebf6ead7490bc1af26

Tests: Use EXPECT_TRUE() instead of EXPECT_EQ(foo, true)

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

M	tests/gtests/blenlib/BLI_array_store_test.cc
M	tests/gtests/blenlib/BLI_ghash_test.cc
M	tests/gtests/blenlib/BLI_polyfill2d_test.cc
M	tests/gtests/blenlib/BLI_stack_test.cc

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

diff --git a/tests/gtests/blenlib/BLI_array_store_test.cc b/tests/gtests/blenlib/BLI_array_store_test.cc
index b71dc4575f..bb2a357755 100644
--- a/tests/gtests/blenlib/BLI_array_store_test.cc
+++ b/tests/gtests/blenlib/BLI_array_store_test.cc
@@ -280,8 +280,8 @@ static void testbuffer_run_tests_single(
         BArrayStore *bs, ListBase *lb)
 {
 	testbuffer_list_store_populate(bs, lb);
-	EXPECT_EQ(true, testbuffer_list_validate(lb));
-	EXPECT_EQ(true, BLI_array_store_is_valid(bs));
+	EXPECT_TRUE(testbuffer_list_validate(lb));
+	EXPECT_TRUE(BLI_array_store_is_valid(bs));
 #ifdef DEBUG_PRINT
 	print_mem_saved("data", bs);
 #endif
@@ -423,8 +423,8 @@ TEST(array_store, TextDupeIncreaseDecrease)
 
 	/* forward */
 	testbuffer_list_store_populate(bs, &lb);
-	EXPECT_EQ(true, testbuffer_list_validate(&lb));
-	EXPECT_EQ(true, BLI_array_store_is_valid(bs));
+	EXPECT_TRUE(testbuffer_list_validate(&lb));
+	EXPECT_TRUE(BLI_array_store_is_valid(bs));
 	EXPECT_EQ(strlen(D), BLI_array_store_calc_size_compacted_get(bs));
 
 	testbuffer_list_store_clear(bs, &lb);
@@ -432,8 +432,8 @@ TEST(array_store, TextDupeIncreaseDecrease)
 
 	/* backwards */
 	testbuffer_list_store_populate(bs, &lb);
-	EXPECT_EQ(true, testbuffer_list_validate(&lb));
-	EXPECT_EQ(true, BLI_array_store_is_valid(bs));
+	EXPECT_TRUE(testbuffer_list_validate(&lb));
+	EXPECT_TRUE(BLI_array_store_is_valid(bs));
 	/* larger since first block doesn't de-duplicate */
 	EXPECT_EQ(strlen(D) * 4, BLI_array_store_calc_size_compacted_get(bs));
 
@@ -782,8 +782,8 @@ TEST(array_store, PlainTextFiles)
 
 	/* forwards */
 	testbuffer_list_store_populate(bs, &lb);
-	EXPECT_EQ(true, testbuffer_list_validate(&lb));
-	EXPECT_EQ(true, BLI_array_store_is_valid(bs));
+	EXPECT_TRUE(testbuffer_list_validate(&lb));
+	EXPECT_TRUE(BLI_array_store_is_valid(bs));
 #ifdef DEBUG_PRINT
 	print_mem_saved("source code forward", bs);
 #endif
@@ -793,8 +793,8 @@ TEST(array_store, PlainTextFiles)
 
 	/* backwards */
 	testbuffer_list_store_populate(bs, &lb);
-	EXPECT_EQ(true, testbuffer_list_validate(&lb));
-	EXPECT_EQ(true, BLI_array_store_is_valid(bs));
+	EXPECT_TRUE(testbuffer_list_validate(&lb));
+	EXPECT_TRUE(BLI_array_store_is_valid(bs));
 #ifdef DEBUG_PRINT
 	print_mem_saved("source code backwards", bs);
 #endif
diff --git a/tests/gtests/blenlib/BLI_ghash_test.cc b/tests/gtests/blenlib/BLI_ghash_test.cc
index ffbe5f5547..71516e773b 100644
--- a/tests/gtests/blenlib/BLI_ghash_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_test.cc
@@ -179,7 +179,7 @@ TEST(ghash, Pop)
 		void *k, *v;
 		bool success = BLI_ghash_pop(ghash, &pop_state, &k, &v);
 		EXPECT_EQ(k, v);
-		EXPECT_EQ(success, true);
+		EXPECT_TRUE(success);
 
 		if (i % 2) {
 			BLI_ghash_insert(ghash, SET_UINT_IN_POINTER(i * 4), SET_UINT_IN_POINTER(i * 4));
diff --git a/tests/gtests/blenlib/BLI_polyfill2d_test.cc b/tests/gtests/blenlib/BLI_polyfill2d_test.cc
index a4ed70fbec..a7c2a9c92c 100644
--- a/tests/gtests/blenlib/BLI_polyfill2d_test.cc
+++ b/tests/gtests/blenlib/BLI_polyfill2d_test.cc
@@ -113,7 +113,7 @@ static void  test_polyfill_topology(
 	     BLI_edgehashIterator_step(ehi), i++)
 	{
 		void **p = BLI_edgehashIterator_getValue_p(ehi);
-		EXPECT_EQ(true, ELEM((intptr_t)*p, 1, 2));
+		EXPECT_TRUE(ELEM((intptr_t)*p, 1, 2));
 	}
 
 	BLI_edgehashIterator_free(ehi);
@@ -135,7 +135,7 @@ static void  test_polyfill_winding(
 			count[winding_test < 0.0f] += 1;
 		}
 	}
-	EXPECT_EQ(true, ELEM(0, count[0], count[1]));
+	EXPECT_TRUE(ELEM(0, count[0], count[1]));
 }
 
 /**
diff --git a/tests/gtests/blenlib/BLI_stack_test.cc b/tests/gtests/blenlib/BLI_stack_test.cc
index 4c0b95f4b6..65ba1ad0f7 100644
--- a/tests/gtests/blenlib/BLI_stack_test.cc
+++ b/tests/gtests/blenlib/BLI_stack_test.cc
@@ -24,7 +24,7 @@ TEST(stack, Empty)
 	BLI_Stack *stack;
 
 	stack = BLI_stack_new(sizeof(int), __func__);
-	EXPECT_EQ(BLI_stack_is_empty(stack), true);
+	EXPECT_TRUE(BLI_stack_is_empty(stack));
 	EXPECT_EQ(BLI_stack_count(stack), 0);
 	BLI_stack_free(stack);
 }
@@ -41,7 +41,7 @@ TEST(stack, One)
 	EXPECT_EQ(BLI_stack_count(stack), 1);
 	BLI_stack_pop(stack, (void *)&out);
 	EXPECT_EQ(in, out);
-	EXPECT_EQ(BLI_stack_is_empty(stack), true);
+	EXPECT_TRUE(BLI_stack_is_empty(stack));
 	EXPECT_EQ(BLI_stack_count(stack), 0);
 	BLI_stack_free(stack);
 }
@@ -64,7 +64,7 @@ TEST(stack, Range)
 		EXPECT_EQ(in, out);
 
 	}
-	EXPECT_EQ(BLI_stack_is_empty(stack), true);
+	EXPECT_TRUE(BLI_stack_is_empty(stack));
 
 	BLI_stack_free(stack);
 }
@@ -91,7 +91,7 @@ TEST(stack, String)
 		BLI_stack_pop(stack, (void *)&out);
 		EXPECT_STREQ(in, out);
 	}
-	EXPECT_EQ(BLI_stack_is_empty(stack), true);
+	EXPECT_TRUE(BLI_stack_is_empty(stack));
 
 	BLI_stack_free(stack);
 }
@@ -115,7 +115,7 @@ TEST(stack, Peek)
 		EXPECT_EQ(*ret, in[i % ARRAY_SIZE(in)]);
 	}
 
-	EXPECT_EQ(BLI_stack_is_empty(stack), true);
+	EXPECT_TRUE(BLI_stack_is_empty(stack));
 
 	BLI_stack_free(stack);
 }
@@ -140,7 +140,7 @@ TEST(stack, Clear)
 		}
 
 		BLI_stack_clear(stack);
-		EXPECT_EQ(BLI_stack_is_empty(stack), true);
+		EXPECT_TRUE(BLI_stack_is_empty(stack));
 
 		/* and again, this time check its valid */
 		for (in = 0; in < tot; in++) {
@@ -153,7 +153,7 @@ TEST(stack, Clear)
 			EXPECT_EQ(in, out);
 		}
 
-		EXPECT_EQ(BLI_stack_is_empty(stack), true);
+		EXPECT_TRUE(BLI_stack_is_empty(stack));
 
 		/* without this, we wont test case when mixed free/used */
 		tot /= 2;