Merge pull request #2 from aronhelser/test_rename

Rename tests, turn off "simple" flag.

Author: jcfr

Testing/Cxx/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Test has a baseline, and writes a file.
 vtk_add_test_cxx(vtkCleaverImageToUnstructuredGridFilterCxxTests tests
-  vtkCleaverImageToUnstructuredGridFilterTest.cxx,NO_DATA
-  vtkCleaverImageToUnstructuredGridFilterTest2.cxx,NO_DATA
+  TestCleaverFilterLabelMapInput.cxx,NO_DATA
+  TestCleaverFilterIndicatorInput.cxx,NO_DATA
   )
 
 vtk_test_cxx_executable(vtkCleaverImageToUnstructuredGridFilterCxxTests tests

Testing/Cxx/vtkCleaverImageToUnstructuredGridFilterTest2.cxx renamed to Testing/Cxx/TestCleaverFilterIndicatorInput.cxx

@@ -35,10 +35,11 @@
 #include "vtkCleaverImageToUnstructuredGridFilter.h"
 
 const int TEST_IMAGE_SIZE = 24;
+
 // Test the use of indicator functions as input. Indicator functions are
 // increasingly positive where the label/region is present, and more negative
 // further from the label/region.
-int vtkCleaverImageToUnstructuredGridFilterTest2(int argc, char* argv[])
+int TestCleaverFilterIndicatorInput(int argc, char* argv[])
 {
   vtkNew<vtkImageData> indicatorImage[3];
   indicatorImage[0]->SetDimensions(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, TEST_IMAGE_SIZE);
@@ -80,9 +81,9 @@ int vtkCleaverImageToUnstructuredGridFilterTest2(int argc, char* argv[])
   cleaverFilter->Update();
 
   // Output checking
-  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfCells() != 6358,
+  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfCells() != 4152,
     "Unexpected number of cells " << cleaverFilter->GetOutput()->GetNumberOfCells());
-  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfPoints() != 1268,
+  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfPoints() != 864,
     "Unexpected number of points " << cleaverFilter->GetOutput()->GetNumberOfPoints());
 
   vtkNew<vtkDataSetMapper> allMapper;

Testing/Cxx/vtkCleaverImageToUnstructuredGridFilterTest.cxx renamed to Testing/Cxx/TestCleaverFilterLabelMapInput.cxx

@@ -35,8 +35,10 @@
 #include "vtkCleaverImageToUnstructuredGridFilter.h"
 
 const int TEST_IMAGE_SIZE = 24;
-// Test the use of a labelmap as input.
-int vtkCleaverImageToUnstructuredGridFilterTest(int argc, char* argv[])
+
+// Test the use of a labelmap as input. Input is computed, background is zero,
+// sphere with label 1.0 centered at (cX, cY, cZ) and sphere with label 1.0 at zero.
+int TestCleaverFilterLabelMapInput(int argc, char* argv[])
 {
   vtkNew<vtkImageData> labelImage;
   labelImage->SetDimensions(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, TEST_IMAGE_SIZE);
@@ -73,9 +75,9 @@ int vtkCleaverImageToUnstructuredGridFilterTest(int argc, char* argv[])
   cleaverFilter->Update();
 
   // Output checking
-  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfCells() != 1170,
+  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfCells() != 822,
     "Unexpected number of cells " << cleaverFilter->GetOutput()->GetNumberOfCells());
-  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfPoints() != 281,
+  vtkLogIf(ERROR, cleaverFilter->GetOutput()->GetNumberOfPoints() != 202,
     "Unexpected number of points " << cleaverFilter->GetOutput()->GetNumberOfPoints());
 
   vtkNew<vtkDataSetMapper> allMapper;

Testing/Data/Baseline/TestCleaverFilterIndicatorInput.png

@@ -488,7 +488,7 @@ int vtkCleaverImageToUnstructuredGridFilter::RequestData(vtkInformation* vtkNotU
     }
     fields = loadIndicatorFunctions(images, this->Sigma);
   }
-  bool simple = true;
+  bool simple = false;
   cleaver::TetMesh* bgMesh = nullptr;
   cleaver::Volume* volume = new cleaver::Volume(fields);
   cleaver::CleaverMesher mesher(simple);