Skip to content

Commit be250b8

Browse files
committed
STYLE: Replace size.Fill with auto size = Size::Filled in tests
Replaced code of the form SizeType size; size.Fill(x); with `auto size = SizeType::Filled(x);` Following C++ Core Guidelines, Oct 3, 2024, "Always initialize an object", https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Res-always Using Notepad++, Replace in Files, doing: Find what: ^([ ]+ )(.*Size.*[^ ])[ ]+(\w+);[\r\n]+ [ ]+\3\.Fill\( Replace with: $1auto $3 = $2::Filled\( Filters: itk*Test*.cxx [v] Match case (*) Regular expression Removed "typename" keywords from `typename T::::SizeType::Filled` calls. Follow-up to pull request #4881 commit 569a8b6 "STYLE: Replace Fill(0) with {} initializer for local variables in tests"
1 parent f36cd56 commit be250b8

File tree

204 files changed

+300
-554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+300
-554
lines changed

Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ itkVtkMedianFilterTest(int argc, char * argv[])
5050
reader->SetFileName(inputFilename);
5151

5252
// Create and setup a median filter
53-
auto medianFilter = FilterType::New();
54-
FilterType::InputSizeType radius;
55-
radius.Fill(2);
53+
auto medianFilter = FilterType::New();
54+
auto radius = FilterType::InputSizeType::Filled(2);
5655
if (argc > 2)
5756
{
5857
radius.Fill(std::stoi(argv[2]));

Modules/Core/Common/test/itkConnectedImageNeighborhoodShapeGTest.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,12 @@ TEST(ConnectedImageNeighborhoodShape, SupportsConstShapedNeighborhoodIterator)
249249

250250
// Create a "dummy" image.
251251
const auto image = ImageType::New();
252-
SizeType imageSize;
253-
imageSize.Fill(1);
252+
auto imageSize = SizeType::Filled(1);
254253
image->SetRegions(imageSize);
255254
image->AllocateInitialized();
256255

257256
// Create a radius, (just) large enough for all offsets activated below here.
258-
SizeType radius;
259-
radius.Fill(1);
257+
auto radius = SizeType::Filled(1);
260258

261259
itk::ConstShapedNeighborhoodIterator<ImageType> shapedNeighborhoodIterator{ radius,
262260
image,

Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ itkConstNeighborhoodIteratorTest(int, char *[])
319319
using ChangeRegionTestImageType = itk::Image<int, 2>;
320320
ChangeRegionTestImageType::IndexType imageCorner{};
321321

322-
ChangeRegionTestImageType::SizeType imageSize;
323-
imageSize.Fill(4);
322+
auto imageSize = ChangeRegionTestImageType::SizeType::Filled(4);
324323

325324
ChangeRegionTestImageType::RegionType imageRegion(imageCorner, imageSize);
326325

@@ -349,14 +348,12 @@ itkConstNeighborhoodIteratorTest(int, char *[])
349348
ChangeRegionTestImageType::IndexType region1Start;
350349
region1Start.Fill(1);
351350

352-
ChangeRegionTestImageType::SizeType regionSize;
353-
regionSize.Fill(1);
351+
auto regionSize = ChangeRegionTestImageType::SizeType::Filled(1);
354352

355353
ChangeRegionTestImageType::RegionType region1(region1Start, regionSize);
356354

357355
// Create the radius (a 3x3 region)
358-
ChangeRegionTestImageType::SizeType neighborhoodRadius;
359-
neighborhoodRadius.Fill(1);
356+
auto neighborhoodRadius = ChangeRegionTestImageType::SizeType::Filled(1);
360357

361358
using NeighborhoodIteratorType = itk::ConstNeighborhoodIterator<ChangeRegionTestImageType>;
362359
NeighborhoodIteratorType neighborhoodIterator(neighborhoodRadius, image, region1);

Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,7 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
419419
using ChangeRegionTestImageType = itk::Image<int, 2>;
420420
ChangeRegionTestImageType::IndexType imageCorner{};
421421

422-
ChangeRegionTestImageType::SizeType imageSize;
423-
imageSize.Fill(4);
422+
auto imageSize = ChangeRegionTestImageType::SizeType::Filled(4);
424423

425424
ChangeRegionTestImageType::RegionType imageRegion(imageCorner, imageSize);
426425

@@ -449,14 +448,12 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
449448
ChangeRegionTestImageType::IndexType region1Start;
450449
region1Start.Fill(1);
451450

452-
ChangeRegionTestImageType::SizeType regionSize;
453-
regionSize.Fill(1);
451+
auto regionSize = ChangeRegionTestImageType::SizeType::Filled(1);
454452

455453
ChangeRegionTestImageType::RegionType region1(region1Start, regionSize);
456454

457455
// Create the radius (a 3x3 region)
458-
ChangeRegionTestImageType::SizeType neighborhoodRadius;
459-
neighborhoodRadius.Fill(1);
456+
auto neighborhoodRadius = ChangeRegionTestImageType::SizeType::Filled(1);
460457

461458
// Use the first two offsets
462459
std::vector<itk::Offset<2>> offsets;

Modules/Core/Common/test/itkImageAlgorithmCopyTest.cxx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ int
119119
itkImageAlgorithmCopyTest(int, char *[])
120120
{
121121
using ImageType3D = itk::Image<char, 3>;
122-
ImageType3D::SizeType size3d;
123-
124-
size3d.Fill(16);
122+
auto size3d = ImageType3D::SizeType::Filled(16);
125123
AverageTestCopy<ImageType3D>(size3d);
126124

127125
size3d.Fill(32);
@@ -134,9 +132,7 @@ itkImageAlgorithmCopyTest(int, char *[])
134132
AverageTestCopy<ImageType3D>(size3d);
135133

136134
using ImageType2D = itk::Image<char, 2>;
137-
ImageType2D::SizeType size2d;
138-
139-
size2d.Fill(16);
135+
auto size2d = ImageType2D::SizeType::Filled(16);
140136
AverageTestCopy<ImageType2D>(size2d);
141137

142138
size2d.Fill(32);

Modules/Core/Common/test/itkImageAlgorithmCopyTest2.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ itkImageAlgorithmCopyTest2(int, char *[])
6565

6666

6767
RegionType::IndexType index{};
68-
RegionType::SizeType size;
69-
size.Fill(64);
68+
auto size = RegionType::SizeType::Filled(64);
7069

7170
RegionType region{ index, size };
7271

Modules/Core/Common/test/itkImageBufferRangeGTest.cxx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ void
153153
ExpectRangeIsNotEmptyForNonEmptyImage()
154154
{
155155
// First create a non-empty image:
156-
const auto image = TImage::New();
157-
typename TImage::SizeType imageSize;
158-
imageSize.Fill(1);
156+
const auto image = TImage::New();
157+
auto imageSize = TImage::SizeType::Filled(1);
159158
image->SetRegions(imageSize);
160159
SetVectorLengthIfImageIsVectorImage(*image, 1);
161160
image->Allocate();
@@ -178,9 +177,8 @@ void
178177
ExpectMakeImageBufferRangeReturnsCorrectRangeForNonEmptyImage()
179178
{
180179
// First create a non-empty image:
181-
const auto image = TImage::New();
182-
typename TImage::SizeType imageSize;
183-
imageSize.Fill(1);
180+
const auto image = TImage::New();
181+
auto imageSize = TImage::SizeType::Filled(1);
184182
image->SetRegions(imageSize);
185183
SetVectorLengthIfImageIsVectorImage(*image, 1);
186184
image->Allocate();

Modules/Core/Common/test/itkImageIteratorWithIndexTest.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ class itkImageIteratorWithIndexTestIteratorTester
4040
{
4141
m_Image = ImageType::New();
4242

43-
typename ImageType::SizeType size;
44-
size.Fill(100);
43+
auto size = ImageType::SizeType::Filled(100);
4544

4645
typename ImageType::IndexType start{};
4746

Modules/Core/Common/test/itkImageRandomNonRepeatingIteratorWithIndexTest2.cxx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ itkImageRandomNonRepeatingIteratorWithIndexTest2(int, char *[])
3636
using RandomConstIteratorType = itk::ImageRandomNonRepeatingConstIteratorWithIndex<ImageType>;
3737
constexpr unsigned long N = 10;
3838
constexpr int Seed = 42;
39-
ImageType::SizeType size;
40-
size.Fill(N);
41-
ImageType::IndexType start{};
42-
ImageType::RegionType region{ start, size };
43-
auto myImage = ImageType::New();
39+
auto size = ImageType::SizeType::Filled(N);
40+
ImageType::IndexType start{};
41+
ImageType::RegionType region{ start, size };
42+
auto myImage = ImageType::New();
4443
myImage->SetRegions(region);
4544
myImage->Allocate();
4645
using WalkType = std::vector<ImageType::IndexType>;

Modules/Core/Common/test/itkImageRegionConstIteratorWithOnlyIndexTest.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class itkImageRegionConstIteratorWithOnlyIndexTestIteratorTester
3434
{
3535
m_Image = ImageType::New();
3636

37-
typename ImageType::SizeType size;
38-
size.Fill(100);
37+
auto size = ImageType::SizeType::Filled(100);
3938

4039
typename ImageType::IndexType start{};
4140

0 commit comments

Comments
 (0)