Merge pull request #39 from jhlegarreta/UpdateTestingMacrosNames

STYLE: Add ITK prefix to testing macros

Author: thewtex

test/BoneMorphometryFeaturesFilterInstantiationTest.cxx

@@ -54,24 +54,24 @@ int BoneMorphometryFeaturesFilterInstantiationTest( int argc, char *argv[] )
   using FilterType = itk::BoneMorphometryFeaturesFilter<InputImageType>;
   FilterType::Pointer filter = FilterType::New();
 
-  EXERCISE_BASIC_OBJECT_METHODS( filter,
+  ITK_EXERCISE_BASIC_OBJECT_METHODS( filter,
   BoneMorphometryFeaturesFilter, ImageToImageFilter );
 
   filter->SetInput( reader->GetOutput() );
 
   //filter->SetMaskImage( maskReader->GetOutput() );
-  //TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
+  //ITK_TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
 
   filter->SetThreshold( 1300 );
-  TEST_SET_GET_VALUE( 1300, filter->GetThreshold() );
+  ITK_TEST_SET_GET_VALUE( 1300, filter->GetThreshold() );
 
-  TRY_EXPECT_NO_EXCEPTION( filter->Update() );
+  ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
 
-  TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.232113, filter->GetBVTV(),6,0.000001));
-  TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.281487, filter->GetTbN(),6,0.000001));
-  TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.824595, filter->GetTbTh(),6,0.000001));
-  TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 2.72796, filter->GetTbSp(),5,0.00001));
-  TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 2.42543, filter->GetBSBV(),5,0.00001));
+  ITK_TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.232113, filter->GetBVTV(),6,0.000001));
+  ITK_TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.281487, filter->GetTbN(),6,0.000001));
+  ITK_TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 0.824595, filter->GetTbTh(),6,0.000001));
+  ITK_TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 2.72796, filter->GetTbSp(),5,0.00001));
+  ITK_TEST_EXPECT_TRUE (itk::Math::FloatAlmostEqual( 2.42543, filter->GetBSBV(),5,0.00001));
 
   std::cout << "Test finished." << std::endl;
   return EXIT_SUCCESS;

test/BoneMorphometryFeaturesImageFilterInstantiationTest.cxx

@@ -60,26 +60,26 @@ int BoneMorphometryFeaturesImageFilterInstantiationTest( int argc, char *argv[]
   using FilterType = itk::BoneMorphometryFeaturesImageFilter<InputImageType, OutputImageType, InputImageType>;
   FilterType::Pointer filter = FilterType::New();
 
-  EXERCISE_BASIC_OBJECT_METHODS( filter,
+  ITK_EXERCISE_BASIC_OBJECT_METHODS( filter,
    BoneMorphometryFeaturesImageFilter, ImageToImageFilter );
 
   filter->SetInput( reader->GetOutput() );
 
   filter->SetMaskImage( maskReader->GetOutput() );
-  TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
+  ITK_TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
 
   filter->SetThreshold( 1300 );
-  TEST_SET_GET_VALUE( 1300, filter->GetThreshold() );
+  ITK_TEST_SET_GET_VALUE( 1300, filter->GetThreshold() );
 
-  TRY_EXPECT_NO_EXCEPTION( filter->Update() );
+  ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
 
   // Create and set up a writer
   using WriterType = itk::ImageFileWriter< OutputImageType >;
   WriterType::Pointer writer = WriterType::New();
   writer->SetFileName( argv[3] );
   writer->SetInput( filter->GetOutput() );
 
-  TRY_EXPECT_NO_EXCEPTION( writer->Update() );
+  ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
 
   std::cout << "Test finished." << std::endl;
   return EXIT_SUCCESS;

test/ReplaceFeatureMapNanInfImageFilterInstantiationTest.cxx

@@ -67,7 +67,7 @@ int ReplaceFeatureMapNanInfImageFilterInstantiationTest( int argc, char *argv[]
   filter->SetMaskImage( maskReader->GetOutput() );
   filter->SetThreshold( 1300 );
 
-  TRY_EXPECT_NO_EXCEPTION( filter->Update() );
+  ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
 
   using PostProcessingFilterType = itk::ReplaceFeatureMapNanInfImageFilter<OutputImageType>;
   PostProcessingFilterType::Pointer postProcessingFilter = PostProcessingFilterType::New();
@@ -81,7 +81,7 @@ int ReplaceFeatureMapNanInfImageFilterInstantiationTest( int argc, char *argv[]
   writer->SetInput( postProcessingFilter->GetOutput() );
 
 
-  TRY_EXPECT_NO_EXCEPTION( writer->Update() );
+  ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
 
   std::cout << "Test finished." << std::endl;
   return EXIT_SUCCESS;