multiblcok test files tweating

This commit is contained in:
dongliangchu 2017-07-12 12:10:30 -04:00
parent 4a2f8d0a9a
commit 264f7e15ab
2 changed files with 5 additions and 9 deletions

@ -45,7 +45,7 @@ void TestMultiBlockCell()
{
std::size_t BlockNum=7;
std::vector<vtkm::filter::ResultField> results = MultiBlockCellTest( BlockNum );
VTKM_TEST_ASSERT(results.size() == vtkm::Float64(BlockNum), "result block number incorrect");
VTKM_TEST_ASSERT(results.size() == BlockNum, "result block number incorrect");
for(std::size_t j = 0; j < results.size(); j++)
{
VTKM_TEST_ASSERT(results[j].GetField().GetData().GetNumberOfValues() == ((j+2)*(j+2)-1)
@ -55,11 +55,11 @@ void TestMultiBlockCell()
results[j].GetField().GetData().CopyTo(array);
for(std::size_t i = 0; i < results[j].GetField().GetData().GetNumberOfValues(); i++)
{
VTKM_TEST_ASSERT(array.GetPortalConstControl().Get(i) == vtkm::Float64(j),
"result incorrect");
VTKM_TEST_ASSERT(array.GetPortalConstControl().Get(i) == j,
"field value incorrect");
}
}
std::cout <<"pass all tests"<<std::endl;
}

@ -33,8 +33,6 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/filter/Histogram.h>
const std::vector<vtkm::filter::ResultField> MultiBlockFieldFilterTest(std::size_t BlockNum);
@ -43,15 +41,13 @@ void TestMultiBlockField()
{
std::size_t BlockNum=7;
std::vector<vtkm::filter::ResultField> results = MultiBlockFieldFilterTest( BlockNum );
VTKM_TEST_ASSERT(results.size() == vtkm::Float64(BlockNum), "result block number incorrect");
VTKM_TEST_ASSERT(results.size() == BlockNum, "result block number incorrect");
for(std::size_t j = 0; j < results.size(); j++)
{
VTKM_TEST_ASSERT(results[j].GetField().GetData().GetNumberOfValues() == 10,
"result cell size incorrect");
}
std::cout <<"pass all tests"<<std::endl;
}