[Bf-blender-cvs] [1a0fed5d8ef] temp-geometry-nodes-fields--fields: Use EXPECT_EQ instead of ASSERT_EQ
Hans Goudey
noreply at git.blender.org
Fri Aug 27 17:55:21 CEST 2021
Commit: 1a0fed5d8ef701cb45845b4219ac3eb2e37e9703
Author: Hans Goudey
Date: Fri Aug 27 10:55:14 2021 -0500
Branches: temp-geometry-nodes-fields--fields
https://developer.blender.org/rB1a0fed5d8ef701cb45845b4219ac3eb2e37e9703
Use EXPECT_EQ instead of ASSERT_EQ
===================================================================
M source/blender/functions/tests/FN_field_test.cc
===================================================================
diff --git a/source/blender/functions/tests/FN_field_test.cc b/source/blender/functions/tests/FN_field_test.cc
index 902bea8e655..da275f7ab92 100644
--- a/source/blender/functions/tests/FN_field_test.cc
+++ b/source/blender/functions/tests/FN_field_test.cc
@@ -17,10 +17,10 @@ TEST(field, ConstantInput)
GMutableSpan result_generic(result.as_mutable_span());
evaluate_fields({&constant_field, 1}, IndexMask(IndexRange(4)), {&result_generic, 1});
- ASSERT_EQ(result[0], 10);
- ASSERT_EQ(result[1], 10);
- ASSERT_EQ(result[2], 10);
- ASSERT_EQ(result[3], 10);
+ EXPECT_EQ(result[0], 10);
+ EXPECT_EQ(result[1], 10);
+ EXPECT_EQ(result[2], 10);
+ EXPECT_EQ(result[3], 10);
}
class IndexFunction : public MultiFunction {
@@ -47,26 +47,27 @@ class IndexFunction : public MultiFunction {
}
};
-TEST(field, IndexInput)
+TEST(field, VArrayInput)
{
+
FieldFunction function = FieldFunction(std::make_unique<IndexFunction>(), {});
Field index_field = Field(CPPType::get<int>(), function, 0);
Array<int> result_1(4);
GMutableSpan result_generic_1(result_1.as_mutable_span());
evaluate_fields({&index_field, 1}, IndexMask(IndexRange(4)), {&result_generic_1, 1});
- ASSERT_EQ(result_1[0], 0);
- ASSERT_EQ(result_1[1], 1);
- ASSERT_EQ(result_1[2], 2);
- ASSERT_EQ(result_1[3], 3);
+ EXPECT_EQ(result_1[0], 0);
+ EXPECT_EQ(result_1[1], 1);
+ EXPECT_EQ(result_1[2], 2);
+ EXPECT_EQ(result_1[3], 3);
Array<int> result_2(4);
GMutableSpan result_generic_2(result_2.as_mutable_span());
evaluate_fields({&index_field, 1}, {20, 30, 40, 50}, {&result_generic_2, 1});
- ASSERT_EQ(result_2[0], 20);
- ASSERT_EQ(result_2[1], 30);
- ASSERT_EQ(result_2[2], 40);
- ASSERT_EQ(result_2[3], 50);
+ EXPECT_EQ(result_2[0], 20);
+ EXPECT_EQ(result_2[1], 30);
+ EXPECT_EQ(result_2[2], 40);
+ EXPECT_EQ(result_2[3], 50);
}
} // namespace blender::fn::tests
More information about the Bf-blender-cvs
mailing list