STYLE: Check properly FEM module test input arguments

Check properly the input arguments in the `FEM` module tests to conform to the ITK SW Guide style guidelines: - Look for the necessary number of arguments. - Remove the argument checking where the only argument is the program name. - Use a consistent message about arguments being missing when an insufficient number of arguments is provided. - Be clear about the input arguments expected: provide a minimal descriptive name for each of them in the error message if arguments are missing.
InsightSoftwareConsortium · Jan 23, 2024 · 60067a6 · 60067a6
1 parent 444acec
commit 60067a6
Show file tree

Hide file tree

Showing 28 changed files with 165 additions and 58 deletions.
diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralMembraneTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearQuadrilateralMembraneTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx
@@ -21,15 +21,18 @@
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
 #include "itkFEMLinearSystemWrapperItpack.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearQuadrilateralStrainTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStressTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStressTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectWriter.h"
 #include "itkFEMElement2DC0LinearQuadrilateralStress.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearQuadrilateralStressTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 2)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   itk::FEMFactoryBase::RegisterDefaultTypes();
 
   constexpr unsigned int Dimension = 2;

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleMembraneTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearTriangleMembraneTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleStrainTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearTriangleStrainTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleStressTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearTriangleStressTest.cxx
@@ -20,19 +20,22 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0LinearTriangleStressTest(int argc, char * argv[])
 {
+  if (argc != 3)
+  {
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
+    return EXIT_FAILURE;
+  }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in
   // the initialization of the itk::FEMFactoryBase::GetFactory()
-  if (argc < 1)
-  {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
-    return EXIT_FAILURE;
-  }
   itk::FEMFactoryBase::GetFactory()->RegisterDefaultTypes();
 
   using Solver2DType = itk::fem::Solver<2>;

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0QuadraticTriangleStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0QuadraticTriangleStrainTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0QuadraticTriangleStrainTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0QuadraticTriangleStressTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0QuadraticTriangleStressTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC0QuadraticTriangleStressTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement2DC1BeamTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx
@@ -20,6 +20,7 @@
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMLinearSystemWrapperDenseVNL.h"
 #include "itkFEMLinearSystemWrapperItpack.h"
+#include "itkTestingMacros.h"
 
 using Solver2DType = itk::fem::Solver<2>;
 
@@ -38,11 +39,13 @@ PrintK1(Solver2DType * S, int s);
 int
 itkFEMElement2DTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 2)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement3DC0LinearHexahedronMembraneTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement3DC0LinearHexahedronStrainTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx
@@ -20,15 +20,18 @@
 #include "itkFEMSolver.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement3DC0LinearTetrahedronMembraneTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx
@@ -22,15 +22,18 @@
 #include "itkSpatialObject.h"
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMSpatialObjectWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFEMElement3DC0LinearTetrahedronStrainTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName outputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx
@@ -21,6 +21,7 @@
 #include "itkFEMSpatialObjectReader.h"
 #include "itkFEMLinearSystemWrapperDenseVNL.h"
 #include "itkFEMLinearSystemWrapperItpack.h"
+#include "itkTestingMacros.h"
 
 using SolverType = itk::fem::Solver<3>;
 
@@ -39,11 +40,13 @@ PrintK1(SolverType * S, int s);
 int
 itkFEMElement3DTest(int argc, char * argv[])
 {
-  if (argc < 1)
+  if (argc != 3)
   {
-    std::cerr << "Missing Spatial Object Filename" << std::endl;
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName" << std::endl;
     return EXIT_FAILURE;
   }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in

diff --git a/Modules/Numerics/FEM/test/itkFEMFactoryTest.cxx b/Modules/Numerics/FEM/test/itkFEMFactoryTest.cxx
@@ -17,10 +17,18 @@
  *=========================================================================*/
 
 #include "itkFEMFactoryBase.h"
+#include "itkTestingMacros.h"
 
 int
 main(int argc, char ** argv)
 {
+  if (argc != 2)
+  {
+    std::cerr << "Missing parameters." << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputFileName" << std::endl;
+    return EXIT_FAILURE;
+  }
+
   // Need to register default FEM object types,
   // and setup spatialReader to recognize FEM types
   // which is all currently done as a HACK in