merging unittest for multiblock filters

This commit is contained in:
dongliangchu 2017-08-12 10:42:40 -04:00
parent 5194b3cd39
commit 833df44202
2 changed files with 4 additions and 3 deletions

@ -35,7 +35,7 @@ set(unit_tests
UnitTestMarchingCubesFilter.cxx
UnitTestMaskFilter.cxx
UnitTestMaskPointsFilter.cxx
UnitTestMultiBlockFieldFilter.cxx
UnitTestMultiBlockFilters.cxx
UnitTestPointAverageFilter.cxx
UnitTestPointElevationFilter.cxx
UnitTestSurfaceNormalsFilter.cxx

@ -123,9 +123,10 @@ void TestMultiBlockFilters()
results = histogram.Execute(Blocks, std::string("cellvar"));
Result_Verify(results, histogram, Blocks, std::string("cellvar"));
Blocks = MultiBlockBuilder<vtkm::Float64>(BlockNum, "pointvar");
Blocks = MultiBlockBuilder<vtkm::Id>(BlockNum, "pointvar");
vtkm::filter::CellAverage cellAverage;
results = cellAverage.Execute(Blocks, std::string("pointvar"));
Result_Verify(results, cellAverage, Blocks, std::string("pointvar"));
return;
@ -133,7 +134,7 @@ void TestMultiBlockFilters()
int UnitTestMultiBlockFieldFilter(int, char* [])
int UnitTestMultiBlockFilters(int, char* [])
{
return vtkm::cont::testing::Testing::Run(TestMultiBlockFilters);
}