diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-04 17:17:54 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-04 17:17:54 +0300 |
commit | b3553c09610e885ccc72230596cb7484369468f6 (patch) | |
tree | fa3e565c7c21c8711b89503a5f5e8ac8db52bcff /tests | |
parent | 194070e6f4d6efe5a1594b1dd0faf1a337b71249 (diff) |
Cleanup: USD tests, use `EXPECT_LT` and `EXPECT_FALSE` where appropriate
Unfortunately there is no `EXPECT_NOT_LT`; as the `HierarchyContext` only
has an `operator<()` function, testing for `(A < B) == false` is different
than simply testing `(A >= B)`.
No functional changes.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/usd/hierarchy_context_order_test.cc | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/gtests/usd/hierarchy_context_order_test.cc b/tests/gtests/usd/hierarchy_context_order_test.cc index ce3b43484e7..a6a8aa16766 100644 --- a/tests/gtests/usd/hierarchy_context_order_test.cc +++ b/tests/gtests/usd/hierarchy_context_order_test.cc @@ -44,9 +44,9 @@ TEST_F(HierarchyContextOrderTest, ObjectPointerTest) ctx_b.object = fake_pointer(2); ctx_b.duplicator = nullptr; - EXPECT_EQ(true, ctx_a < ctx_b); - EXPECT_EQ(false, ctx_b < ctx_a); - EXPECT_EQ(false, ctx_a < ctx_a); + EXPECT_LT(ctx_a, ctx_b); + EXPECT_FALSE(ctx_b < ctx_a); + EXPECT_FALSE(ctx_a < ctx_a); } TEST_F(HierarchyContextOrderTest, DuplicatorPointerTest) @@ -61,9 +61,9 @@ TEST_F(HierarchyContextOrderTest, DuplicatorPointerTest) ctx_b.duplicator = fake_pointer(1); ctx_b.export_name = "B"; - EXPECT_EQ(true, ctx_a < ctx_b); - EXPECT_EQ(false, ctx_b < ctx_a); - EXPECT_EQ(false, ctx_a < ctx_a); + EXPECT_LT(ctx_a, ctx_b); + EXPECT_FALSE(ctx_b < ctx_a); + EXPECT_FALSE(ctx_a < ctx_a); } TEST_F(HierarchyContextOrderTest, ExportParentTest) @@ -76,9 +76,9 @@ TEST_F(HierarchyContextOrderTest, ExportParentTest) ctx_b.object = fake_pointer(1); ctx_b.export_parent = fake_pointer(2); - EXPECT_EQ(true, ctx_a < ctx_b); - EXPECT_EQ(false, ctx_b < ctx_a); - EXPECT_EQ(false, ctx_a < ctx_a); + EXPECT_LT(ctx_a, ctx_b); + EXPECT_FALSE(ctx_b < ctx_a); + EXPECT_FALSE(ctx_a < ctx_a); } TEST_F(HierarchyContextOrderTest, TransitiveTest) @@ -107,17 +107,17 @@ TEST_F(HierarchyContextOrderTest, TransitiveTest) ctx_d.duplicator = nullptr; ctx_d.export_name = "D"; - EXPECT_EQ(true, ctx_a < ctx_b); - EXPECT_EQ(true, ctx_a < ctx_c); - EXPECT_EQ(true, ctx_a < ctx_d); - EXPECT_EQ(true, ctx_b < ctx_c); - EXPECT_EQ(true, ctx_b < ctx_d); - EXPECT_EQ(true, ctx_c < ctx_d); - - EXPECT_EQ(false, ctx_b < ctx_a); - EXPECT_EQ(false, ctx_c < ctx_a); - EXPECT_EQ(false, ctx_d < ctx_a); - EXPECT_EQ(false, ctx_c < ctx_b); - EXPECT_EQ(false, ctx_d < ctx_b); - EXPECT_EQ(false, ctx_d < ctx_c); + EXPECT_LT(ctx_a, ctx_b); + EXPECT_LT(ctx_a, ctx_c); + EXPECT_LT(ctx_a, ctx_d); + EXPECT_LT(ctx_b, ctx_c); + EXPECT_LT(ctx_b, ctx_d); + EXPECT_LT(ctx_c, ctx_d); + + EXPECT_FALSE(ctx_b < ctx_a); + EXPECT_FALSE(ctx_c < ctx_a); + EXPECT_FALSE(ctx_d < ctx_a); + EXPECT_FALSE(ctx_c < ctx_b); + EXPECT_FALSE(ctx_d < ctx_b); + EXPECT_FALSE(ctx_d < ctx_c); } |