Merge pull request #4887 from N-Dekker/Replace-Fill-with-empty-initializer-or-Filled

Replace `Fill(T{})` with `{}` initialization, replace `T var; var.Fill` with `auto var = T::Filled` in tests

Author: thewtex

Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx

@@ -50,9 +50,8 @@ itkVtkMedianFilterTest(int argc, char * argv[])
   reader->SetFileName(inputFilename);
 
   // Create and setup a median filter
-  auto                      medianFilter = FilterType::New();
-  FilterType::InputSizeType radius;
-  radius.Fill(2);
+  auto medianFilter = FilterType::New();
+  auto radius = FilterType::InputSizeType::Filled(2);
   if (argc > 2)
   {
     radius.Fill(std::stoi(argv[2]));

Modules/Core/Common/test/itkConnectedImageNeighborhoodShapeGTest.cxx

@@ -249,14 +249,12 @@ TEST(ConnectedImageNeighborhoodShape, SupportsConstShapedNeighborhoodIterator)
 
   // Create a "dummy" image.
   const auto image = ImageType::New();
-  SizeType   imageSize;
-  imageSize.Fill(1);
+  auto       imageSize = SizeType::Filled(1);
   image->SetRegions(imageSize);
   image->AllocateInitialized();
 
   // Create a radius, (just) large enough for all offsets activated below here.
-  SizeType radius;
-  radius.Fill(1);
+  auto radius = SizeType::Filled(1);
 
   itk::ConstShapedNeighborhoodIterator<ImageType> shapedNeighborhoodIterator{ radius,
                                                                               image,

Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx

@@ -319,8 +319,7 @@ itkConstNeighborhoodIteratorTest(int, char *[])
     using ChangeRegionTestImageType = itk::Image<int, 2>;
     ChangeRegionTestImageType::IndexType imageCorner{};
 
-    ChangeRegionTestImageType::SizeType imageSize;
-    imageSize.Fill(4);
+    auto imageSize = ChangeRegionTestImageType::SizeType::Filled(4);
 
     ChangeRegionTestImageType::RegionType imageRegion(imageCorner, imageSize);
 
@@ -346,17 +345,14 @@ itkConstNeighborhoodIteratorTest(int, char *[])
     }
 
     // Setup and iterate over the first region
-    ChangeRegionTestImageType::IndexType region1Start;
-    region1Start.Fill(1);
+    auto region1Start = ChangeRegionTestImageType::IndexType::Filled(1);
 
-    ChangeRegionTestImageType::SizeType regionSize;
-    regionSize.Fill(1);
+    auto regionSize = ChangeRegionTestImageType::SizeType::Filled(1);
 
     ChangeRegionTestImageType::RegionType region1(region1Start, regionSize);
 
     // Create the radius (a 3x3 region)
-    ChangeRegionTestImageType::SizeType neighborhoodRadius;
-    neighborhoodRadius.Fill(1);
+    auto neighborhoodRadius = ChangeRegionTestImageType::SizeType::Filled(1);
 
     using NeighborhoodIteratorType = itk::ConstNeighborhoodIterator<ChangeRegionTestImageType>;
     NeighborhoodIteratorType neighborhoodIterator(neighborhoodRadius, image, region1);
@@ -385,8 +381,7 @@ itkConstNeighborhoodIteratorTest(int, char *[])
     }
 
     // Change iteration region
-    ChangeRegionTestImageType::IndexType region2start;
-    region2start.Fill(2);
+    auto region2start = ChangeRegionTestImageType::IndexType::Filled(2);
 
     ChangeRegionTestImageType::RegionType region2(region2start, regionSize);
 

Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx

@@ -419,8 +419,7 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
     using ChangeRegionTestImageType = itk::Image<int, 2>;
     ChangeRegionTestImageType::IndexType imageCorner{};
 
-    ChangeRegionTestImageType::SizeType imageSize;
-    imageSize.Fill(4);
+    auto imageSize = ChangeRegionTestImageType::SizeType::Filled(4);
 
     ChangeRegionTestImageType::RegionType imageRegion(imageCorner, imageSize);
 
@@ -446,17 +445,14 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
     }
 
     // Setup and iterate over the first region
-    ChangeRegionTestImageType::IndexType region1Start;
-    region1Start.Fill(1);
+    auto region1Start = ChangeRegionTestImageType::IndexType::Filled(1);
 
-    ChangeRegionTestImageType::SizeType regionSize;
-    regionSize.Fill(1);
+    auto regionSize = ChangeRegionTestImageType::SizeType::Filled(1);
 
     ChangeRegionTestImageType::RegionType region1(region1Start, regionSize);
 
     // Create the radius (a 3x3 region)
-    ChangeRegionTestImageType::SizeType neighborhoodRadius;
-    neighborhoodRadius.Fill(1);
+    auto neighborhoodRadius = ChangeRegionTestImageType::SizeType::Filled(1);
 
     // Use the first two offsets
     std::vector<itk::Offset<2>>           offsets;
@@ -498,8 +494,7 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
     //}
 
     // Change iteration region
-    ChangeRegionTestImageType::IndexType region2start;
-    region2start.Fill(2);
+    auto region2start = ChangeRegionTestImageType::IndexType::Filled(2);
 
     ChangeRegionTestImageType::RegionType region2(region2start, regionSize);
 

Modules/Core/Common/test/itkImageAlgorithmCopyTest.cxx

@@ -119,9 +119,7 @@ int
 itkImageAlgorithmCopyTest(int, char *[])
 {
   using ImageType3D = itk::Image<char, 3>;
-  ImageType3D::SizeType size3d;
-
-  size3d.Fill(16);
+  auto size3d = ImageType3D::SizeType::Filled(16);
   AverageTestCopy<ImageType3D>(size3d);
 
   size3d.Fill(32);
@@ -134,9 +132,7 @@ itkImageAlgorithmCopyTest(int, char *[])
   AverageTestCopy<ImageType3D>(size3d);
 
   using ImageType2D = itk::Image<char, 2>;
-  ImageType2D::SizeType size2d;
-
-  size2d.Fill(16);
+  auto size2d = ImageType2D::SizeType::Filled(16);
   AverageTestCopy<ImageType2D>(size2d);
 
   size2d.Fill(32);

Modules/Core/Common/test/itkImageAlgorithmCopyTest2.cxx

@@ -65,8 +65,7 @@ itkImageAlgorithmCopyTest2(int, char *[])
 
 
   RegionType::IndexType index{};
-  RegionType::SizeType  size;
-  size.Fill(64);
+  auto                  size = RegionType::SizeType::Filled(64);
 
   RegionType region{ index, size };
 

Modules/Core/Common/test/itkImageBufferRangeGTest.cxx

@@ -153,9 +153,8 @@ void
 ExpectRangeIsNotEmptyForNonEmptyImage()
 {
   // First create a non-empty image:
-  const auto                image = TImage::New();
-  typename TImage::SizeType imageSize;
-  imageSize.Fill(1);
+  const auto image = TImage::New();
+  auto       imageSize = TImage::SizeType::Filled(1);
   image->SetRegions(imageSize);
   SetVectorLengthIfImageIsVectorImage(*image, 1);
   image->Allocate();
@@ -178,9 +177,8 @@ void
 ExpectMakeImageBufferRangeReturnsCorrectRangeForNonEmptyImage()
 {
   // First create a non-empty image:
-  const auto                image = TImage::New();
-  typename TImage::SizeType imageSize;
-  imageSize.Fill(1);
+  const auto image = TImage::New();
+  auto       imageSize = TImage::SizeType::Filled(1);
   image->SetRegions(imageSize);
   SetVectorLengthIfImageIsVectorImage(*image, 1);
   image->Allocate();

Modules/Core/Common/test/itkImageIteratorWithIndexTest.cxx

@@ -40,8 +40,7 @@ class itkImageIteratorWithIndexTestIteratorTester
   {
     m_Image = ImageType::New();
 
-    typename ImageType::SizeType size;
-    size.Fill(100);
+    auto size = ImageType::SizeType::Filled(100);
 
     typename ImageType::IndexType start{};
 

Modules/Core/Common/test/itkImageRandomNonRepeatingIteratorWithIndexTest2.cxx

@@ -36,11 +36,10 @@ itkImageRandomNonRepeatingIteratorWithIndexTest2(int, char *[])
   using RandomConstIteratorType = itk::ImageRandomNonRepeatingConstIteratorWithIndex<ImageType>;
   constexpr unsigned long N = 10;
   constexpr int           Seed = 42;
-  ImageType::SizeType     size;
-  size.Fill(N);
-  ImageType::IndexType  start{};
-  ImageType::RegionType region{ start, size };
-  auto                  myImage = ImageType::New();
+  auto                    size = ImageType::SizeType::Filled(N);
+  ImageType::IndexType    start{};
+  ImageType::RegionType   region{ start, size };
+  auto                    myImage = ImageType::New();
   myImage->SetRegions(region);
   myImage->Allocate();
   using WalkType = std::vector<ImageType::IndexType>;

Modules/Core/Common/test/itkImageRegionConstIteratorWithOnlyIndexTest.cxx

@@ -34,8 +34,7 @@ class itkImageRegionConstIteratorWithOnlyIndexTestIteratorTester
   {
     m_Image = ImageType::New();
 
-    typename ImageType::SizeType size;
-    size.Fill(100);
+    auto size = ImageType::SizeType::Filled(100);
 
     typename ImageType::IndexType start{};