From f3acfc97d933b58c27580a7192d7bffc49e512e8 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 5 Aug 2020 17:18:56 +0200 Subject: Functions: fix multi function test There were two issues. First, I made a mistake when I switched from unsigned to signed integers. Second, two classes with the same name were defined in separate files. Those classes are in an anonymus namespace now, so that they don't leak into other files. --- source/blender/functions/tests/FN_multi_function_network_test.cc | 2 ++ source/blender/functions/tests/FN_multi_function_test.cc | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/functions/tests/FN_multi_function_network_test.cc b/source/blender/functions/tests/FN_multi_function_network_test.cc index 53290e9170c..f226e0eac2e 100644 --- a/source/blender/functions/tests/FN_multi_function_network_test.cc +++ b/source/blender/functions/tests/FN_multi_function_network_test.cc @@ -7,6 +7,7 @@ #include "FN_multi_function_network_evaluation.hh" namespace blender::fn::tests { +namespace { TEST(multi_function_network, Test1) { @@ -250,4 +251,5 @@ TEST(multi_function_network, Test2) } } +} // namespace } // namespace blender::fn::tests diff --git a/source/blender/functions/tests/FN_multi_function_test.cc b/source/blender/functions/tests/FN_multi_function_test.cc index 6acb6e22b01..cc023bce597 100644 --- a/source/blender/functions/tests/FN_multi_function_test.cc +++ b/source/blender/functions/tests/FN_multi_function_test.cc @@ -6,6 +6,7 @@ #include "FN_multi_function_builder.hh" namespace blender::fn::tests { +namespace { class AddFunction : public MultiFunction { public: @@ -125,7 +126,7 @@ TEST(multi_function, CreateRangeFunction) { CreateRangeFunction fn; - GVectorArray ranges(CPPType::get(), 5); + GVectorArray ranges(CPPType::get(), 5); GVectorArrayRef ranges_ref(ranges); Array sizes = {3, 0, 6, 1, 4}; @@ -382,4 +383,5 @@ TEST(multi_function, CustomMF_Convert) EXPECT_EQ(outputs[2], 9); } +} // namespace } // namespace blender::fn::tests -- cgit v1.2.3