Skip to content

Commit b719a38

Browse files
jhlegarretahjmjohnson
jhlegarreta
authored and
hjmjohnson
committed
STYLE: Add ITK prefix to testing macros
1 parent f2fbb8f commit b719a38

12 files changed

+52
-52
lines changed

‎test/CoocurrenceTextureFeaturesImageFilterInstantiationTest.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,48 +65,48 @@ int CoocurrenceTextureFeaturesImageFilterInstantiationTest( int argc, char *argv
6565
InputImageType, OutputImageType >;
6666
FilterType::Pointer filter = FilterType::New();
6767

68-
EXERCISE_BASIC_OBJECT_METHODS( filter,
68+
ITK_EXERCISE_BASIC_OBJECT_METHODS( filter,
6969
CoocurrenceTextureFeaturesImageFilter, ImageToImageFilter );
7070

7171

7272
filter->SetInput( reader->GetOutput() );
7373

7474
filter->SetMaskImage( maskReader->GetOutput() );
75-
TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
75+
ITK_TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
7676

7777
unsigned int numberOfBinsPerAxis = 15;
7878
filter->SetNumberOfBinsPerAxis( numberOfBinsPerAxis );
79-
TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
79+
ITK_TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
8080

8181

8282
FilterType::PixelType min = -62;
8383
FilterType::PixelType max = 2456;
8484
filter->SetHistogramMinimum( min );
8585
filter->SetHistogramMaximum( max );
86-
TEST_SET_GET_VALUE( min, filter->GetHistogramMinimum() );
87-
TEST_SET_GET_VALUE( max, filter->GetHistogramMaximum() );
86+
ITK_TEST_SET_GET_VALUE( min, filter->GetHistogramMinimum() );
87+
ITK_TEST_SET_GET_VALUE( max, filter->GetHistogramMaximum() );
8888

8989
NeighborhoodType::SizeValueType neighborhoodRadius = 3;
9090
NeighborhoodType hood;
9191
hood.SetRadius( neighborhoodRadius );
9292
filter->SetNeighborhoodRadius( hood.GetRadius() );
93-
TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
93+
ITK_TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
9494

9595
FilterType::MaskPixelType insidePixelValue = 0;
9696
filter->SetInsidePixelValue( insidePixelValue );
97-
TEST_SET_GET_VALUE( insidePixelValue, filter->GetInsidePixelValue() );
97+
ITK_TEST_SET_GET_VALUE( insidePixelValue, filter->GetInsidePixelValue() );
9898

9999
FilterType::OffsetType offset = {{-1, 0, 1}};
100100
FilterType::OffsetVector::Pointer offsetVector = FilterType::OffsetVector::New();
101101
offsetVector->push_back( offset );
102102
filter->SetOffsets( offsetVector );
103-
TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
103+
ITK_TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
104104

105105
filter->SetOffsets( offsetVector );
106-
TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
106+
ITK_TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
107107

108108

109-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
109+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
110110

111111

112112
std::cout << "Test finished." << std::endl;

‎test/CoocurrenceTextureFeaturesImageFilterTest.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ int CoocurrenceTextureFeaturesImageFilterTest( int argc, char *argv[] )
8181
filter->SetNeighborhoodRadius( hood.GetRadius() );
8282
}
8383

84-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
84+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
8585

8686
// Create and set up a writer
8787
using WriterType = itk::ImageFileWriter< OutputImageType >;
8888
WriterType::Pointer writer = WriterType::New();
8989
writer->SetFileName( argv[3] );
9090
writer->SetInput( filter->GetOutput() );
9191

92-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
92+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
9393

9494

9595
std::cout << "Test finished." << std::endl;

‎test/CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *a
8989
filter->SetNeighborhoodRadius( hood.GetRadius() );
9090
}
9191

92-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
92+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
9393

9494

9595
using FeatureImageType = itk::Image< OutputPixelComponentType, ImageDimension >;
@@ -112,7 +112,7 @@ int CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *a
112112
writer->SetFileName( outputFilename + "_1" + s + ".nrrd" );
113113
writer->SetInput( indexSelectionFilter->GetOutput() );
114114

115-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
115+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
116116
}
117117

118118

‎test/CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ int CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int ar
8888
filter->SetNeighborhoodRadius( hood.GetRadius() );
8989
}
9090

91-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
91+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
9292

9393

9494
using FeatureImageType = itk::Image< OutputPixelType, ImageDimension >;
@@ -111,7 +111,7 @@ int CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int ar
111111
writer->SetFileName( outputFilename + "_1" + s + ".nrrd" );
112112
writer->SetInput( indexSelectionFilter->GetOutput() );
113113

114-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
114+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
115115
}
116116

117117

‎test/CoocurrenceTextureFeaturesImageFilterTestWithVectorImage.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ int CoocurrenceTextureFeaturesImageFilterTestWithVectorImage( int argc, char *ar
6565
InputImageType, OutputImageType, InputImageType >;
6666
FilterType::Pointer filter = FilterType::New();
6767

68-
EXERCISE_BASIC_OBJECT_METHODS( filter, CoocurrenceTextureFeaturesImageFilter,
68+
ITK_EXERCISE_BASIC_OBJECT_METHODS( filter, CoocurrenceTextureFeaturesImageFilter,
6969
ImageToImageFilter );
7070

7171

@@ -88,15 +88,15 @@ int CoocurrenceTextureFeaturesImageFilterTestWithVectorImage( int argc, char *ar
8888
filter->SetNeighborhoodRadius( hood.GetRadius() );
8989
}
9090

91-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
91+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
9292

9393
// Create and set up a writer
9494
using WriterType = itk::ImageFileWriter< OutputImageType >;
9595
WriterType::Pointer writer = WriterType::New();
9696
writer->SetFileName( argv[3] );
9797
writer->SetInput( filter->GetOutput() );
9898

99-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
99+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
100100

101101

102102
std::cout << "Test finished." << std::endl;

‎test/CoocurrenceTextureFeaturesImageFilterTestWithoutMask.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ int CoocurrenceTextureFeaturesImageFilterTestWithoutMask( int argc, char *argv[]
8080
filter->SetNeighborhoodRadius( hood.GetRadius() );
8181
}
8282

83-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
83+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
8484

8585
// Create and set up a writer
8686
using WriterType = itk::ImageFileWriter< OutputImageType >;
8787
WriterType::Pointer writer = WriterType::New();
8888
writer->SetFileName( argv[2] );
8989
writer->SetInput( filter->GetOutput() );
9090

91-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
91+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
9292

9393

9494
std::cout << "Test finished." << std::endl;

‎test/RunLengthTextureFeaturesImageFilterInstantiationTest.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,54 +65,54 @@ int RunLengthTextureFeaturesImageFilterInstantiationTest( int argc, char *argv[]
6565

6666
FilterType::Pointer filter = FilterType::New();
6767

68-
EXERCISE_BASIC_OBJECT_METHODS( filter,
68+
ITK_EXERCISE_BASIC_OBJECT_METHODS( filter,
6969
RunLengthTextureFeaturesImageFilter, ImageToImageFilter );
7070

7171

7272
filter->SetInput( reader->GetOutput() );
7373

7474
filter->SetMaskImage( maskReader->GetOutput() );
75-
TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
75+
ITK_TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
7676

7777
unsigned int numberOfBinsPerAxis = 15;
7878
filter->SetNumberOfBinsPerAxis( numberOfBinsPerAxis );
79-
TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
79+
ITK_TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
8080

8181
FilterType::PixelType pixelValueMin = -62;
8282
FilterType::PixelType pixelValueMax = 2456;
8383
filter->SetHistogramValueMinimum( pixelValueMin );
8484
filter->SetHistogramValueMaximum( pixelValueMax );
85-
TEST_SET_GET_VALUE( pixelValueMin, filter->GetHistogramValueMinimum() );
86-
TEST_SET_GET_VALUE( pixelValueMax, filter->GetHistogramValueMaximum() );
85+
ITK_TEST_SET_GET_VALUE( pixelValueMin, filter->GetHistogramValueMinimum() );
86+
ITK_TEST_SET_GET_VALUE( pixelValueMax, filter->GetHistogramValueMaximum() );
8787

8888
FilterType::RealType minDistance = 0.15;
8989
FilterType::RealType maxDistance = 1.5;
9090
filter->SetHistogramDistanceMinimum( minDistance );
9191
filter->SetHistogramDistanceMaximum( maxDistance );
92-
TEST_SET_GET_VALUE( minDistance, filter->GetHistogramDistanceMinimum() );
93-
TEST_SET_GET_VALUE( maxDistance, filter->GetHistogramDistanceMaximum() );
92+
ITK_TEST_SET_GET_VALUE( minDistance, filter->GetHistogramDistanceMinimum() );
93+
ITK_TEST_SET_GET_VALUE( maxDistance, filter->GetHistogramDistanceMaximum() );
9494

9595
NeighborhoodType::SizeValueType neighborhoodRadius = 3;
9696
NeighborhoodType hood;
9797
hood.SetRadius( neighborhoodRadius );
9898
filter->SetNeighborhoodRadius( hood.GetRadius() );
99-
TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
99+
ITK_TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
100100

101101
FilterType::MaskPixelType insidePixelValue = 0;
102102
filter->SetInsidePixelValue( insidePixelValue );
103-
TEST_SET_GET_VALUE( insidePixelValue, filter->GetInsidePixelValue() );
103+
ITK_TEST_SET_GET_VALUE( insidePixelValue, filter->GetInsidePixelValue() );
104104

105105
FilterType::OffsetType offset = {{-1, 0, 1}};
106106
FilterType::OffsetVector::Pointer offsetVector = FilterType::OffsetVector::New();
107107
offsetVector->push_back( offset );
108108
filter->SetOffsets( offsetVector );
109-
TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
109+
ITK_TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
110110

111111
filter->SetOffsets( offsetVector );
112-
TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
112+
ITK_TEST_SET_GET_VALUE( offsetVector, filter->GetOffsets() );
113113

114114

115-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
115+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
116116

117117

118118
std::cout << "Test finished." << std::endl;

‎test/RunLengthTextureFeaturesImageFilterTest.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,50 +70,50 @@ int RunLengthTextureFeaturesImageFilterTest( int argc, char *argv[] )
7070

7171
FilterType::Pointer filter = FilterType::New();
7272

73-
EXERCISE_BASIC_OBJECT_METHODS( filter, RunLengthTextureFeaturesImageFilter,
73+
ITK_EXERCISE_BASIC_OBJECT_METHODS( filter, RunLengthTextureFeaturesImageFilter,
7474
ImageToImageFilter );
7575

7676

7777
filter->SetInput( reader->GetOutput() );
7878
filter->SetMaskImage( maskReader->GetOutput() );
79-
TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
79+
ITK_TEST_SET_GET_VALUE( maskReader->GetOutput(), filter->GetMaskImage() );
8080

8181
if( argc >= 5 )
8282
{
8383
unsigned int numberOfBinsPerAxis = std::stoi( argv[4] );
8484
filter->SetNumberOfBinsPerAxis( numberOfBinsPerAxis );
85-
TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
85+
ITK_TEST_SET_GET_VALUE( numberOfBinsPerAxis, filter->GetNumberOfBinsPerAxis() );
8686

8787
FilterType::PixelType pixelValueMin = std::stod( argv[5] );
8888
FilterType::PixelType pixelValueMax = std::stod( argv[6] );
8989
filter->SetHistogramValueMinimum( pixelValueMin );
9090
filter->SetHistogramValueMaximum( pixelValueMax );
91-
TEST_SET_GET_VALUE( pixelValueMin, filter->GetHistogramValueMinimum() );
92-
TEST_SET_GET_VALUE( pixelValueMax, filter->GetHistogramValueMaximum() );
91+
ITK_TEST_SET_GET_VALUE( pixelValueMin, filter->GetHistogramValueMinimum() );
92+
ITK_TEST_SET_GET_VALUE( pixelValueMax, filter->GetHistogramValueMaximum() );
9393

9494
FilterType::RealType minDistance = std::stod( argv[7] );
9595
FilterType::RealType maxDistance = std::stod( argv[8] );
9696
filter->SetHistogramDistanceMinimum( minDistance );
9797
filter->SetHistogramDistanceMaximum( maxDistance );
98-
TEST_SET_GET_VALUE( minDistance, filter->GetHistogramDistanceMinimum() );
99-
TEST_SET_GET_VALUE( maxDistance, filter->GetHistogramDistanceMaximum() );
98+
ITK_TEST_SET_GET_VALUE( minDistance, filter->GetHistogramDistanceMinimum() );
99+
ITK_TEST_SET_GET_VALUE( maxDistance, filter->GetHistogramDistanceMaximum() );
100100

101101
NeighborhoodType::SizeValueType neighborhoodRadius = std::stoi( argv[9] );
102102
NeighborhoodType hood;
103103
hood.SetRadius( neighborhoodRadius );
104104
filter->SetNeighborhoodRadius( hood.GetRadius() );
105-
TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
105+
ITK_TEST_SET_GET_VALUE( hood.GetRadius(), filter->GetNeighborhoodRadius() );
106106
}
107107

108-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
108+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
109109

110110
// Create and set up a writer
111111
using WriterType = itk::ImageFileWriter< OutputImageType >;
112112
WriterType::Pointer writer = WriterType::New();
113113
writer->SetFileName( argv[3] );
114114
writer->SetInput( filter->GetOutput() );
115115

116-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
116+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
117117

118118

119119
std::cout << "Test finished." << std::endl;

‎test/RunLengthTextureFeaturesImageFilterTestSeparateFeatures.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int RunLengthTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *arg
9696
filter->SetNeighborhoodRadius( hood.GetRadius() );
9797
}
9898

99-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
99+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
100100

101101

102102
using FeatureImageType = itk::Image< OutputPixelComponentType, ImageDimension >;
@@ -119,7 +119,7 @@ int RunLengthTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *arg
119119
writer->SetFileName( outputFilename + "_" + s + ".nrrd" );
120120
writer->SetInput( indexSelectionFilter->GetOutput() );
121121

122-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
122+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
123123
}
124124

125125

‎test/RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int argc
9696
filter->SetNeighborhoodRadius( hood.GetRadius() );
9797
}
9898

99-
TRY_EXPECT_NO_EXCEPTION( filter->Update() );
99+
ITK_TRY_EXPECT_NO_EXCEPTION( filter->Update() );
100100

101101

102102
using FeatureImageType = itk::Image< OutputPixelComponentType, ImageDimension >;
@@ -119,7 +119,7 @@ int RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int argc
119119
writer->SetFileName( outputFilename + "_" + s + ".nrrd" );
120120
writer->SetInput( indexSelectionFilter->GetOutput() );
121121

122-
TRY_EXPECT_NO_EXCEPTION( writer->Update() );
122+
ITK_TRY_EXPECT_NO_EXCEPTION( writer->Update() );
123123
}
124124

125125

0 commit comments

Comments
 (0)