[Bf-blender-cvs] [030e99588d] master: Tests: Use proper order for EXPECT_EQ()

Sergey Sharybin noreply at git.blender.org
Fri Feb 3 12:14:08 CET 2017


Commit: 030e99588d48c0f0a15cce110b1e9ac1a585bb86
Author: Sergey Sharybin
Date:   Fri Feb 3 12:03:59 2017 +0100
Branches: master
https://developer.blender.org/rB030e99588d48c0f0a15cce110b1e9ac1a585bb86

Tests: Use proper order for EXPECT_EQ()

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

M	tests/gtests/blenlib/BLI_array_store_test.cc
M	tests/gtests/blenlib/BLI_array_utils_test.cc
M	tests/gtests/blenlib/BLI_ghash_performance_test.cc
M	tests/gtests/blenlib/BLI_ghash_test.cc
M	tests/gtests/blenlib/BLI_hash_mm2a_test.cc
M	tests/gtests/blenlib/BLI_listbase_test.cc
M	tests/gtests/blenlib/BLI_path_util_test.cc
M	tests/gtests/blenlib/BLI_polyfill2d_test.cc
M	tests/gtests/blenlib/BLI_stack_test.cc
M	tests/gtests/blenlib/BLI_string_test.cc
M	tests/gtests/blenlib/BLI_string_utf8_test.cc
M	tests/gtests/bmesh/bmesh_core_test.cc
M	tests/gtests/guardedalloc/guardedalloc_alignment_test.cc

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

diff --git a/tests/gtests/blenlib/BLI_array_store_test.cc b/tests/gtests/blenlib/BLI_array_store_test.cc
index bb2a357755..5af6e639e6 100644
--- a/tests/gtests/blenlib/BLI_array_store_test.cc
+++ b/tests/gtests/blenlib/BLI_array_store_test.cc
@@ -326,7 +326,7 @@ TEST(array_store, NopState)
 	BArrayStore *bs = BLI_array_store_create(1, 32);
 	const unsigned char data[] = "test";
 	BArrayState *state = BLI_array_store_state_add(bs, data, sizeof(data) - 1, NULL);
-	EXPECT_EQ(sizeof(data) - 1, BLI_array_store_state_size_get(state));
+	EXPECT_EQ(BLI_array_store_state_size_get(state), sizeof(data) - 1);
 	BLI_array_store_state_remove(bs, state);
 	BLI_array_store_destroy(bs);
 }
@@ -340,7 +340,7 @@ TEST(array_store, Single)
 	size_t data_dst_len;
 	data_dst = (char *)BLI_array_store_state_data_get_alloc(state, &data_dst_len);
 	EXPECT_STREQ(data_src, data_dst);
-	EXPECT_EQ(sizeof(data_src), data_dst_len);
+	EXPECT_EQ(data_dst_len, sizeof(data_src));
 	BLI_array_store_destroy(bs);
 	MEM_freeN((void *)data_dst);
 }
@@ -354,8 +354,8 @@ TEST(array_store, DoubleNop)
 	BArrayState *state_a = BLI_array_store_state_add(bs, data_src, sizeof(data_src), NULL);
 	BArrayState *state_b = BLI_array_store_state_add(bs, data_src, sizeof(data_src), state_a);
 
-	EXPECT_EQ(sizeof(data_src),     BLI_array_store_calc_size_compacted_get(bs));
-	EXPECT_EQ(sizeof(data_src) * 2, BLI_array_store_calc_size_expanded_get(bs));
+	EXPECT_EQ(BLI_array_store_calc_size_compacted_get(bs), sizeof(data_src));
+	EXPECT_EQ(BLI_array_store_calc_size_expanded_get(bs), sizeof(data_src) * 2);
 
 	size_t data_dst_len;
 
@@ -367,7 +367,7 @@ TEST(array_store, DoubleNop)
 	EXPECT_STREQ(data_src, data_dst);
 	MEM_freeN((void *)data_dst);
 
-	EXPECT_EQ(sizeof(data_src), data_dst_len);
+	EXPECT_EQ(data_dst_len, sizeof(data_src));
 	BLI_array_store_destroy(bs);
 }
 
@@ -382,8 +382,8 @@ TEST(array_store, DoubleDiff)
 	BArrayState *state_b = BLI_array_store_state_add(bs, data_src_b, sizeof(data_src_b), state_a);
 	size_t data_dst_len;
 
-	EXPECT_EQ(sizeof(data_src_a) * 2, BLI_array_store_calc_size_compacted_get(bs));
-	EXPECT_EQ(sizeof(data_src_a) * 2, BLI_array_store_calc_size_expanded_get(bs));
+	EXPECT_EQ(BLI_array_store_calc_size_compacted_get(bs), sizeof(data_src_a) * 2);
+	EXPECT_EQ(BLI_array_store_calc_size_expanded_get(bs), sizeof(data_src_a) * 2);
 
 	data_dst = (char *)BLI_array_store_state_data_get_alloc(state_a, &data_dst_len);
 	EXPECT_STREQ(data_src_a, data_dst);
@@ -425,7 +425,7 @@ TEST(array_store, TextDupeIncreaseDecrease)
 	testbuffer_list_store_populate(bs, &lb);
 	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));
+	EXPECT_EQ(BLI_array_store_calc_size_compacted_get(bs), strlen(D));
 
 	testbuffer_list_store_clear(bs, &lb);
 	BLI_listbase_reverse(&lb);
@@ -435,7 +435,7 @@ TEST(array_store, TextDupeIncreaseDecrease)
 	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));
+	EXPECT_EQ(BLI_array_store_calc_size_compacted_get(bs), strlen(D) * 4);
 
 #undef D
 	testbuffer_list_free(&lb); \
@@ -708,7 +708,7 @@ static void random_chunk_mutate_helper(
 	testbuffer_run_tests_single(bs, &lb);
 
 	size_t expected_size = chunks_per_buffer * chunk_count * stride;
-	EXPECT_EQ(expected_size, BLI_array_store_calc_size_compacted_get(bs));
+	EXPECT_EQ(BLI_array_store_calc_size_compacted_get(bs), expected_size);
 
 	BLI_array_store_destroy(bs);
 
diff --git a/tests/gtests/blenlib/BLI_array_utils_test.cc b/tests/gtests/blenlib/BLI_array_utils_test.cc
index eabf5bc72c..518cd09732 100644
--- a/tests/gtests/blenlib/BLI_array_utils_test.cc
+++ b/tests/gtests/blenlib/BLI_array_utils_test.cc
@@ -45,50 +45,50 @@ TEST(array_utils, ReverseInt4)
 TEST(array_utils, FindIndexStringEmpty)
 {
 	char data[] = "", find = '0';
-	EXPECT_EQ(-1, BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find));
-	EXPECT_EQ(-1, BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find), -1);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find), -1);
 }
 
 TEST(array_utils, FindIndexStringSingle)
 {
 	char data[] = "0", find = '0';
-	EXPECT_EQ(0, BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find));
-	EXPECT_EQ(0, BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find), 0);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find), 0);
 }
 
 TEST(array_utils, FindIndexStringSingleMissing)
 {
 	char data[] = "1", find = '0';
-	EXPECT_EQ(-1, BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find));
-	EXPECT_EQ(-1, BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find), -1);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find), -1);
 }
 
 TEST(array_utils, FindIndexString4)
 {
 	char data[] = "0123", find = '3';
-	EXPECT_EQ(3, BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find));
-	EXPECT_EQ(3, BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data) - 1, &find), 3);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data) - 1, &find), 3);
 }
 
 TEST(array_utils, FindIndexInt4)
 {
 	int data[] = {0, 1, 2, 3}, find = 3;
-	EXPECT_EQ(3, BLI_array_findindex(data,  ARRAY_SIZE(data), &find));
-	EXPECT_EQ(3, BLI_array_rfindindex(data, ARRAY_SIZE(data), &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data), &find), 3);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data), &find), 3);
 }
 
 TEST(array_utils, FindIndexInt4_DupeEnd)
 {
 	int data[] = {0, 1, 2, 0}, find = 0;
-	EXPECT_EQ(0, BLI_array_findindex(data,  ARRAY_SIZE(data), &find));
-	EXPECT_EQ(3, BLI_array_rfindindex(data, ARRAY_SIZE(data), &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data), &find), 0);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data), &find), 3);
 }
 
 TEST(array_utils, FindIndexInt4_DupeMid)
 {
 	int data[] = {1, 0, 0, 3}, find = 0;
-	EXPECT_EQ(1, BLI_array_findindex(data,  ARRAY_SIZE(data), &find));
-	EXPECT_EQ(2, BLI_array_rfindindex(data, ARRAY_SIZE(data), &find));
+	EXPECT_EQ(BLI_array_findindex(data,  ARRAY_SIZE(data), &find), 1);
+	EXPECT_EQ(BLI_array_rfindindex(data, ARRAY_SIZE(data), &find), 2);
 }
 
 TEST(array_utils, FindIndexPointer)
@@ -102,18 +102,18 @@ TEST(array_utils, FindIndexPointer)
 
 #define STACK_PUSH_AND_CHECK_FORWARD(v, i) { \
 	STACK_PUSH(data, v); \
-	EXPECT_EQ(i, BLI_array_findindex(data,  STACK_SIZE(data), &(v))); \
+	EXPECT_EQ(BLI_array_findindex(data,  STACK_SIZE(data), &(v)), i); \
 } ((void)0)
 
 #define STACK_PUSH_AND_CHECK_BACKWARD(v, i) { \
 	STACK_PUSH(data, v); \
-	EXPECT_EQ(i, BLI_array_rfindindex(data, STACK_SIZE(data), &(v))); \
+	EXPECT_EQ(BLI_array_rfindindex(data, STACK_SIZE(data), &(v)), i); \
 } ((void)0)
 
 #define STACK_PUSH_AND_CHECK_BOTH(v, i) { \
 	STACK_PUSH(data, v); \
-	EXPECT_EQ(i, BLI_array_findindex(data,  STACK_SIZE(data), &(v))); \
-	EXPECT_EQ(i, BLI_array_rfindindex(data, STACK_SIZE(data), &(v))); \
+	EXPECT_EQ(BLI_array_findindex(data,  STACK_SIZE(data), &(v)), i); \
+	EXPECT_EQ(BLI_array_rfindindex(data, STACK_SIZE(data), &(v)), i); \
 } ((void)0)
 
 	STACK_PUSH_AND_CHECK_BOTH(a, 0);
diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
index fb32cb3f0a..924c84d72d 100644
--- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc
+++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc
@@ -118,21 +118,21 @@ static void str_ghash_tests(GHash *ghash, const char *id)
 		TIMEIT_START(string_lookup);
 
 		v = BLI_ghash_lookup(ghash, data_bis);
-		EXPECT_EQ(data_bis[0], GET_INT_FROM_POINTER(v));
+		EXPECT_EQ(GET_INT_FROM_POINTER(v), data_bis[0]);
 
 		for (p = w = c = data_bis; *c; c++) {
 			if (*c == '.') {
 				*c = '\0';
 				v = BLI_ghash_lookup(ghash, w);
-				EXPECT_EQ(w[0], GET_INT_FROM_POINTER(v));
+				EXPECT_EQ(GET_INT_FROM_POINTER(v), w[0]);
 				v = BLI_ghash_lookup(ghash, p);
-				EXPECT_EQ(p[0], GET_INT_FROM_POINTER(v));
+				EXPECT_EQ(GET_INT_FROM_POINTER(v), p[0]);
 				p = w = c + 1;
 			}
 			else if (*c == ' ') {
 				*c = '\0';
 				v = BLI_ghash_lookup(ghash, w);
-				EXPECT_EQ(w[0], GET_INT_FROM_POINTER(v));
+				EXPECT_EQ(GET_INT_FROM_POINTER(v), w[0]);
 				w = c + 1;
 			}
 		}
@@ -195,7 +195,7 @@ static void int_ghash_tests(GHash *ghash, const char *id, const unsigned int nbr
 
 		while (i--) {
 			void *v = BLI_ghash_lookup(ghash, SET_UINT_IN_POINTER(i));
-			EXPECT_EQ(i, GET_UINT_FROM_POINTER(v));
+			EXPECT_EQ(GET_UINT_FROM_POINTER(v), i);
 		}
 
 		TIMEIT_END(int_lookup);
@@ -214,7 +214,7 @@ static void int_ghash_tests(GHash *ghash, const char *id, const unsigned int nbr
 
 		TIMEIT_END(int_pop);
 	}
-	EXPECT_EQ(0, BLI_ghash_size(ghash));
+	EXPECT_EQ(BLI_ghash_size(ghash), 0);
 
 	BLI_ghash_free(ghash, NULL, NULL);
 
@@ -292,7 +292,7 @@ static void randint_ghash_tests(GHash *ghash, const char *id, const unsigned int
 
 		for (i = nbr, dt = data; i--; dt++) {
 			void *v = BLI_ghash_lookup(ghash, SET_UINT_IN_POINTER(*dt));
-			EXPECT_EQ(*dt, GET_UINT_FROM_POINTER(v));
+			EXPECT_EQ(GET_UINT_FROM_POINTER(v), *dt);
 		}
 
 		TIMEIT_END(int_lookup);
@@ -403,7 +403,7 @@ static void int4_ghash_tests(GHash *ghash, const char *id, const unsigned int nb
 
 		for (i = nbr, dt = data; i--; dt++) {
 			void *v = BLI_ghash_lookup(ghash, (void *)(*dt));
-			EXPECT_EQ(i, GET_UINT_FROM_POINTER(v));
+			EXPECT_EQ(GET_UINT_FROM_POINTER(v), i);
 		}
 
 		TIMEIT_END(int_v4_lookup);
@@ -469,7 +469,7 @@ static void multi_small_ghash_tests_one(GHash *ghash, RNG *rng, const unsigned i
 
 	for (i = nbr, dt = data; i--; dt++) {
 		void *v = BLI_ghash_lookup(ghash, SET_UINT_IN_POINTER(*dt));
-		EXPECT_EQ(*dt, GET_UINT_FROM_POINTER(v));
+		EXPECT_EQ(GET_UINT_FROM_POINTER(v), *dt);
 	}
 
 	BLI_ghash_clear(ghash, NULL, NULL);
diff --git a/tests/gtests/blenlib/BLI_ghash_test.cc b/tests/gtests/blenlib/BLI_ghash_test.cc
index 71516e773b..6d075e2911 10064

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list