COMP: Tests use aggregate types for initialization

Initialization of regions and sizes is simpler with aggregate types

Changes made to the tests directories as a followup to changes
made in 6281dc8

Prefer initialization to declaration and assignment.
Prefer constexpr for size and index initialization.

Author: hjmjohnson

Modules/Core/Common/test/itkAdaptorComparisonTest.cxx

@@ -170,16 +170,9 @@ itkAdaptorComparisonTest(int, char *[])
   using VectorImageType = itk::Image<itk::Vector<float, 3>, 3>;
 
   // Set up some images
-  itk::ImageRegion<3> region;
-  itk::Size<3>        size;
-  size[0] = 100;
-  size[1] = 100;
-  size[2] = 100;
-  itk::Index<3> index;
-  index[0] = 0;
-  index[1] = 0;
-  index[2] = 0;
-  region = { index, size };
+  constexpr itk::Size<3>  size{ 100, 100, 100 };
+  constexpr itk::Index<3> index{ 0, 0, 0 };
+  itk::ImageRegion<3>     region = { index, size };
 
   auto scalar_image = ScalarImageType::New();
   auto vector_image = VectorImageType::New();

Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx

@@ -51,25 +51,13 @@ GetTestImage(int d1, int d2, int d3, int d4)
 int
 itkConstNeighborhoodIteratorTest(int, char *[])
 {
-  const TestImageType::Pointer                             img = GetTestImage(10, 10, 5, 3);
-  itk::ConstNeighborhoodIterator<TestImageType>::IndexType loc;
-  loc[0] = 4;
-  loc[1] = 4;
-  loc[2] = 2;
-  loc[3] = 1;
-
-  itk::ConstNeighborhoodIterator<TestImageType>::RadiusType radius;
-  radius[0] = radius[1] = radius[2] = radius[3] = 1;
+  const TestImageType::Pointer                              img = GetTestImage(10, 10, 5, 3);
+  itk::ConstNeighborhoodIterator<TestImageType>::IndexType  loc{ 4, 4, 2, 1 };
+  itk::ConstNeighborhoodIterator<TestImageType>::RadiusType radius{ 1, 1, 1, 1 };
 
-  itk::ConstNeighborhoodIterator<TestImageType>::RegionType reg;
-  itk::ConstNeighborhoodIterator<TestImageType>::SizeType   sz;
-  itk::ConstNeighborhoodIterator<TestImageType>::IndexType  idx;
-  idx[0] = idx[1] = idx[2] = 0;
-  idx[3] = 1;
-  sz[0] = sz[1] = 10;
-  sz[2] = 5;
-  sz[3] = 1;
-  reg = { idx, sz };
+  constexpr itk::ConstNeighborhoodIterator<TestImageType>::SizeType  sz{ 10, 10, 5, 1 };
+  constexpr itk::ConstNeighborhoodIterator<TestImageType>::IndexType idx{ 0, 0, 0, 1 };
+  itk::ConstNeighborhoodIterator<TestImageType>::RegionType          reg = { idx, sz };
 
   println("Creating ConstNeighborhoodIterator");
   itk::ConstNeighborhoodIterator<TestImageType> it(radius, img, reg);

Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx

@@ -49,24 +49,12 @@ itkConstNeighborhoodIteratorWithOnlyIndexTestRun()
   using ConstNeighborhoodIteratorType = itk::ConstNeighborhoodIteratorWithOnlyIndex<ImageType>;
   using IndexType = typename ConstNeighborhoodIteratorType::IndexType;
 
-  IndexType loc;
-  loc[0] = 4;
-  loc[1] = 4;
-  loc[2] = 2;
-  loc[3] = 1;
-
-  typename ConstNeighborhoodIteratorType::RadiusType radius;
-  radius[0] = radius[1] = radius[2] = radius[3] = 1;
+  IndexType loc{ 4, 4, 2, 1 };
 
-  typename ConstNeighborhoodIteratorType::RegionType reg;
-  typename ConstNeighborhoodIteratorType::SizeType   sz;
-  IndexType                                          idx;
-  idx[0] = idx[1] = idx[2] = 0;
-  idx[3] = 1;
-  sz[0] = sz[1] = 10;
-  sz[2] = 5;
-  sz[3] = 1;
-  reg = { idx, sz };
+  typename ConstNeighborhoodIteratorType::RadiusType         radius{ 1, 1, 1, 1 };
+  constexpr typename ConstNeighborhoodIteratorType::SizeType sz{ 10, 10, 5, 1 };
+  constexpr IndexType                                        idx{ 0, 0, 0, 1 };
+  typename ConstNeighborhoodIteratorType::RegionType         reg = { idx, sz };
 
   std::cout << "Creating ConstNeighborhoodIterator" << std::endl;
   ConstNeighborhoodIteratorType it(radius, img, reg);

Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest.cxx

@@ -42,19 +42,12 @@ itkConstShapedNeighborhoodIteratorTest(int, char *[])
   loc[3] = 1;
 
   // radius of the iterator
-  itk::ConstShapedNeighborhoodIterator<TestImageType>::RadiusType radius;
-  radius[0] = radius[1] = radius[2] = radius[3] = 1;
-
+  itk::ConstShapedNeighborhoodIterator<TestImageType>::RadiusType radius{ 1, 1, 1, 1 };
   // region over which the iterator is defined
-  itk::ConstShapedNeighborhoodIterator<TestImageType>::RegionType reg;
-  itk::ConstShapedNeighborhoodIterator<TestImageType>::SizeType   sz;
-  itk::ConstShapedNeighborhoodIterator<TestImageType>::IndexType  idx;
-  idx[0] = idx[1] = idx[2] = 0;
-  idx[3] = 1;
-  sz[0] = sz[1] = 10;
-  sz[2] = 5;
-  sz[3] = 1;
-  reg = { idx, sz };
+
+  constexpr itk::ConstShapedNeighborhoodIterator<TestImageType>::SizeType  sz{ 10, 10, 5, 1 };
+  constexpr itk::ConstShapedNeighborhoodIterator<TestImageType>::IndexType idx{ 0, 0, 0, 1 };
+  itk::ConstShapedNeighborhoodIterator<TestImageType>::RegionType          reg = { idx, sz };
 
   // initialize an iterator
   println("Creating ConstShapedNeighborhoodIterator");

Modules/Core/Common/test/itkConstShapedNeighborhoodIteratorTest2.cxx

@@ -53,27 +53,15 @@ MyDerivedCSNI<ImageType>::TestNewExposedProtectedMembers()
 int
 itkConstShapedNeighborhoodIteratorTest2(int, char *[])
 {
-  const TestImageType::Pointer            img = GetTestImage(10, 10, 5, 3);
-  MyDerivedCSNI<TestImageType>::IndexType loc;
-  loc[0] = 4;
-  loc[1] = 4;
-  loc[2] = 2;
-  loc[3] = 1;
+  const TestImageType::Pointer img = GetTestImage(10, 10, 5, 3);
 
   // radius of the iterator
-  MyDerivedCSNI<TestImageType>::RadiusType radius;
-  radius[0] = radius[1] = radius[2] = radius[3] = 1;
+  constexpr MyDerivedCSNI<TestImageType>::RadiusType radius{ 1, 1, 1, 1 };
 
   // region over which the iterator is defined
-  MyDerivedCSNI<TestImageType>::RegionType reg;
-  MyDerivedCSNI<TestImageType>::SizeType   sz;
-  MyDerivedCSNI<TestImageType>::IndexType  idx;
-  idx[0] = idx[1] = idx[2] = 0;
-  idx[3] = 1;
-  sz[0] = sz[1] = 10;
-  sz[2] = 5;
-  sz[3] = 1;
-  reg = { idx, sz };
+  constexpr MyDerivedCSNI<TestImageType>::SizeType  sz{ 10, 10, 5, 1 };
+  constexpr MyDerivedCSNI<TestImageType>::IndexType idx{ 0, 0, 0, 1 };
+  MyDerivedCSNI<TestImageType>::RegionType          reg = { idx, sz };
 
   // initialize an iterator
   println("Creating ConstShapedNeighborhoodIterator");

Modules/Core/Common/test/itkExtractImageTest.cxx

@@ -150,8 +150,6 @@ itkExtractImageTest(int, char *[])
             << extract->GetOutput()->GetSpacing()[1] << std::endl;
 
 
-  ShortImage::RegionType requestedRegion;
-
   // CASE 1
   extractIndex[0] = 1;
   extractIndex[1] = 2;
@@ -160,7 +158,7 @@ itkExtractImageTest(int, char *[])
   extractRegion = { extractIndex, extractSize };
   extract->SetExtractionRegion(extractRegion);
   extract->UpdateLargestPossibleRegion();
-  requestedRegion = extract->GetOutput()->GetRequestedRegion();
+  ShortImage::RegionType requestedRegion = extract->GetOutput()->GetRequestedRegion();
 
   itk::ImageRegionIterator<ShortImage> iteratorIn1(extract->GetOutput(), requestedRegion);
 

Modules/Core/Common/test/itkImageAlgorithmCopyTest.cxx

@@ -29,11 +29,9 @@ AverageTestCopy(typename TImage::SizeType & size)
 
   using PixelType = typename TImage::PixelType;
   using ImageType = TImage;
-  typename ImageType::RegionType region;
 
-
-  const typename ImageType::IndexType index{};
-  region = { index, size };
+  constexpr typename ImageType::IndexType index{};
+  typename ImageType::RegionType          region = { index, size };
 
   auto inImage = ImageType::New();
   inImage->SetRegions(region);

Modules/Core/Common/test/itkImageDuplicatorTest.cxx

@@ -28,13 +28,9 @@ int
 itkImageDuplicatorTest(int, char *[])
 {
   using ImageType = itk::Image<float, 3>;
-  ImageType::RegionType region;
-  ImageType::SizeType   size;
-  size[0] = 10;
-  size[1] = 20;
-  size[2] = 30;
+  constexpr ImageType::SizeType  size{ 10, 20, 30 };
   constexpr ImageType::IndexType index{};
-  region = { index, size };
+  ImageType::RegionType          region = { index, size };
 
   {
     /** Create an image */

Modules/Core/Common/test/itkImageRegionTest.cxx

@@ -45,10 +45,7 @@ itkImageRegionTest(int, char *[])
   constexpr IndexType startB = { { 14, 14, 14 } };
   constexpr IndexType endA = { { 21, 31, 41 } };
 
-  RegionType regionA;
-  RegionType regionB;
-
-  regionA = { startA, sizeA };
+  RegionType regionA = { startA, sizeA };
 
   if (regionA.GetUpperIndex() != endA)
   {
@@ -110,7 +107,7 @@ itkImageRegionTest(int, char *[])
     std::cout << "Caught expected exception" << err;
   }
 
-  regionB = { startB, sizeB };
+  RegionType regionB = { startB, sizeB };
 
   // Test IsInside( integerIndex )
   IndexType index = startA;

Modules/Core/Common/test/itkImportImageTest.cxx

@@ -44,10 +44,9 @@ itkImportImageTest(int, char *[])
   ITK_EXERCISE_BASIC_OBJECT_METHODS(basicImport, ImportImageFilter, ImageSource);
 
   ShortImage::Pointer                              image;
-  itk::ImageRegion<Dimension>                      region;
   constexpr itk::ImageRegion<Dimension>::IndexType index = { { 0, 0 } };
   constexpr itk::ImageRegion<Dimension>::SizeType  size = { { 8, 12 } };
-  region = { index, size };
+  itk::ImageRegion<Dimension>                      region = { index, size };
   // local scope to make sure that imported data is not deleted with ImportImageFilter
   // but with the ImportImageContainer is creates.
   {