blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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.
This commit is contained in:
Jacques Lucke 2020-08-05 17:18:56 +02:00
parent b3d35d2039
commit f3acfc97d9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/functions/tests/FN_multi_function_network_test.cc
View File

@ -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

4
source/blender/functions/tests/FN_multi_function_test.cc
View File

@ -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<int32_t>(), 5);
GVectorArray ranges(CPPType::get<uint>(), 5);
GVectorArrayRef<uint> ranges_ref(ranges);
Array<uint> 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