[Bf-blender-cvs] [1bd6ed71286] master: Correct gtest EXPECT use

Campbell Barton noreply at git.blender.org
Mon Jun 12 02:27:24 CEST 2017


Commit: 1bd6ed712863d1b052f71a39a71b11796d9caaa2
Author: Campbell Barton
Date:   Mon Jun 12 10:25:18 2017 +1000
Branches: master
https://developer.blender.org/rB1bd6ed712863d1b052f71a39a71b11796d9caaa2

Correct gtest EXPECT use

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

M	tests/gtests/blenlib/BLI_kdopbvh_test.cc

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

diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
index e65f0fafa67..bc8cf58d69d 100644
--- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc
+++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
@@ -44,7 +44,7 @@ TEST(kdopbvh, Single)
 		BLI_bvhtree_insert(tree, 0, co, 1);
 	}
 
-	EXPECT_EQ(1, BLI_bvhtree_get_size(tree));
+	EXPECT_EQ(BLI_bvhtree_get_size(tree), 1);
 
 	BLI_bvhtree_balance(tree);
 	BLI_bvhtree_free(tree);
@@ -77,7 +77,8 @@ static void find_nearest_points_test(int points_len, float scale, int round, int
 				fflush(stdout);
 			}
 #endif
-			EXPECT_TRUE(j >= 0 && j < points_len);
+			EXPECT_GE(j, 0);
+			EXPECT_LT(j, points_len);
 			EXPECT_EQ_ARRAY(points[i], points[j], 3);
 		}
 	}




More information about the Bf-blender-cvs mailing list