diff --git a/Modules/Bridge/VtkGlue/test/itkImageToVTKImageFilterRGBTest.cxx b/Modules/Bridge/VtkGlue/test/itkImageToVTKImageFilterRGBTest.cxx index a714014b4f2..c34023072b3 100644 --- a/Modules/Bridge/VtkGlue/test/itkImageToVTKImageFilterRGBTest.cxx +++ b/Modules/Bridge/VtkGlue/test/itkImageToVTKImageFilterRGBTest.cxx @@ -20,6 +20,7 @@ #include "itkImageFileReader.h" #include "itkRGBPixel.h" +#include "itkTestingMacros.h" int itkImageToVTKImageFilterRGBTest(int argc, char * argv[]) @@ -27,7 +28,7 @@ itkImageToVTKImageFilterRGBTest(int argc, char * argv[]) if (argc != 2) { std::cerr << "Usage: "; - std::cerr << argv[0]; + std::cerr << itkNameOfTestExecutableMacro(argv); std::cerr << " "; std::cerr << std::endl; diff --git a/Modules/Bridge/VtkGlue/test/itkVtkConnectedComponentImageFilterTest.cxx b/Modules/Bridge/VtkGlue/test/itkVtkConnectedComponentImageFilterTest.cxx index 71eb24466d7..55f68f3148a 100644 --- a/Modules/Bridge/VtkGlue/test/itkVtkConnectedComponentImageFilterTest.cxx +++ b/Modules/Bridge/VtkGlue/test/itkVtkConnectedComponentImageFilterTest.cxx @@ -37,13 +37,14 @@ #include #include #include "QuickView.h" +#include "itkTestingMacros.h" int itkVtkConnectedComponentImageFilterTest(int argc, char * argv[]) { if (argc < 2) { - std::cout << "Usage: " << argv[0]; + std::cout << "Usage: " << itkNameOfTestExecutableMacro(argv); std::cout << " inputImageFile"; std::cerr << std::endl; return EXIT_FAILURE; diff --git a/Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx b/Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx index 9d9277164f4..f915faeeb93 100644 --- a/Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx +++ b/Modules/Bridge/VtkGlue/test/itkVtkMedianFilterTest.cxx @@ -25,6 +25,7 @@ #include #include "QuickView.h" +#include "itkTestingMacros.h" int itkVtkMedianFilterTest(int argc, char * argv[]) @@ -33,7 +34,7 @@ itkVtkMedianFilterTest(int argc, char * argv[]) if (argc < 2) { std::cerr << "Usage: " << std::endl; - std::cerr << argv[0] << " InputImageFile [radius]" << std::endl; + std::cerr << itkNameOfTestExecutableMacro(argv) << " InputImageFile [radius]" << std::endl; return EXIT_FAILURE; } std::string inputFilename = argv[1]; diff --git a/Modules/Core/Common/test/itkDownCastTest.cxx b/Modules/Core/Common/test/itkDownCastTest.cxx index aeab7c23bc5..73124a1df99 100644 --- a/Modules/Core/Common/test/itkDownCastTest.cxx +++ b/Modules/Core/Common/test/itkDownCastTest.cxx @@ -24,6 +24,7 @@ #include "itkDynamicLoader.h" +#include "itkTestingMacros.h" using PRODUCER_FUNCTION = itk::Object * (*)(); using DYNAMIC_DOWNCAST_FUNCTION = int (*)(const char * type, const char * instanceSource, itk::Object const * base); @@ -33,7 +34,7 @@ itkDownCastTest(int argc, char * argv[]) { if (argc < 2) { - std::cerr << "Usage: " << argv[0] << " " << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " " << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/FFT/test/itkFFTWComplexToComplexFFTImageFilterTest.cxx b/Modules/Filtering/FFT/test/itkFFTWComplexToComplexFFTImageFilterTest.cxx index 9f7c5bc2747..e082477ab20 100644 --- a/Modules/Filtering/FFT/test/itkFFTWComplexToComplexFFTImageFilterTest.cxx +++ b/Modules/Filtering/FFT/test/itkFFTWComplexToComplexFFTImageFilterTest.cxx @@ -41,6 +41,7 @@ #include "itkFFTWComplexToComplexFFTImageFilter.h" #include "itkFFTWForwardFFTImageFilter.h" #include "itkFFTWInverseFFTImageFilter.h" +#include "itkTestingMacros.h" template int @@ -99,7 +100,8 @@ itkFFTWComplexToComplexFFTImageFilterTest(int argc, char * argv[]) { if (argc < 4) { - std::cerr << "Usage: " << argv[0] << " " << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " " + << std::endl; return EXIT_FAILURE; } const char * inputImageFileName = argv[1]; diff --git a/Modules/Filtering/FFT/test/itkForward1DFFTImageFilterTest.cxx b/Modules/Filtering/FFT/test/itkForward1DFFTImageFilterTest.cxx index d88641b14de..2a94f072965 100644 --- a/Modules/Filtering/FFT/test/itkForward1DFFTImageFilterTest.cxx +++ b/Modules/Filtering/FFT/test/itkForward1DFFTImageFilterTest.cxx @@ -74,7 +74,7 @@ itkForward1DFFTImageFilterTest(int argc, char * argv[]) if (argc < 3) { std::cerr << "Missing Parameters." << std::endl; - std::cerr << "Usage: " << argv[0]; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv); std::cerr << " inputImage outputImagePrefix [backend]" << std::endl; std::cerr << "backend implementation options:" << std::endl; std::cerr << " 0 default" << std::endl; diff --git a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOOrientationTest.cxx b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOOrientationTest.cxx index 85590d35b1c..9034ae73d64 100644 --- a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOOrientationTest.cxx +++ b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOOrientationTest.cxx @@ -25,6 +25,7 @@ #include "itkSubtractImageFilter.h" #include "itkPhilipsRECImageIO.h" +#include "itkTestingMacros.h" int itkPhilipsRECImageIOOrientationTest(int argc, char * argv[]) @@ -32,7 +33,7 @@ itkPhilipsRECImageIOOrientationTest(int argc, char * argv[]) if (argc < 4) { - std::cerr << "Usage: " << argv[0] << " ReferenceImage TargetImage "; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " ReferenceImage TargetImage "; std::cerr << "OutputImage" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOPrintTest.cxx b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOPrintTest.cxx index 0a87fb39185..d36cd1d7a6d 100644 --- a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOPrintTest.cxx +++ b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOPrintTest.cxx @@ -21,6 +21,7 @@ #include #include "vnl/vnl_vector_fixed.h" +#include "itkTestingMacros.h" int itkPhilipsRECImageIOPrintTest(int argc, char * argv[]) @@ -28,7 +29,7 @@ itkPhilipsRECImageIOPrintTest(int argc, char * argv[]) if (argc < 2) { - std::cerr << "Usage: " << argv[0] << " InputImage" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOTest.cxx b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOTest.cxx index d7a2a6049e8..e44b4ae0412 100644 --- a/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOTest.cxx +++ b/Modules/IO/PhilipsREC/test/itkPhilipsRECImageIOTest.cxx @@ -20,6 +20,7 @@ #include "itkImageFileWriter.h" #include "itkPhilipsRECImageIOFactory.h" +#include "itkTestingMacros.h" int itkPhilipsRECImageIOTest(int argc, char * argv[]) @@ -27,7 +28,7 @@ itkPhilipsRECImageIOTest(int argc, char * argv[]) if (argc < 3) { - std::cerr << "Usage: " << argv[0] << " InputImage OutputImage" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage OutputImage" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Nonunit/IntegratedTest/test/itkBioRadImageIOTest.cxx b/Modules/Nonunit/IntegratedTest/test/itkBioRadImageIOTest.cxx index 9b2d2aa9664..2472a9b2358 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkBioRadImageIOTest.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkBioRadImageIOTest.cxx @@ -19,6 +19,7 @@ #include "itkImageFileWriter.h" #include "itkBioRadImageIO.h" #include "itkImage.h" +#include "itkTestingMacros.h" // Specific ImageIO test @@ -27,7 +28,7 @@ itkBioRadImageIOTest(int argc, char * argv[]) { if (argc < 3) { - std::cerr << "Usage: " << argv[0] << " BioRad.pic OutputImage.pic\n"; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " BioRad.pic OutputImage.pic\n"; return EXIT_FAILURE; } diff --git a/Modules/Nonunit/IntegratedTest/test/itkImageToHistogramFilterTest4.cxx b/Modules/Nonunit/IntegratedTest/test/itkImageToHistogramFilterTest4.cxx index 1840ae7416a..d806aa01e60 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkImageToHistogramFilterTest4.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkImageToHistogramFilterTest4.cxx @@ -29,6 +29,7 @@ #include "itkComposeImageFilter.h" #include "itkRescaleIntensityImageFilter.h" #include "itkSimpleFilterWatcher.h" +#include "itkTestingMacros.h" template int @@ -38,7 +39,8 @@ itkImageToHistogramFilterTest4Templated(int argc, char * argv[]) if (argc < 4) { std::cerr << "Missing command line arguments" << std::endl; - std::cerr << "Usage : " << argv[0] << " inputImageFileName inputImageFileName outputHistogramFile" << std::endl; + std::cerr << "Usage : " << itkNameOfTestExecutableMacro(argv) + << " inputImageFileName inputImageFileName outputHistogramFile" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Nonunit/IntegratedTest/test/itkMaskedImageToHistogramFilterTest1.cxx b/Modules/Nonunit/IntegratedTest/test/itkMaskedImageToHistogramFilterTest1.cxx index e88e0d782b6..318bc01ab22 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkMaskedImageToHistogramFilterTest1.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkMaskedImageToHistogramFilterTest1.cxx @@ -25,6 +25,7 @@ #include "itkComposeImageFilter.h" #include "itkRescaleIntensityImageFilter.h" #include "itkSimpleFilterWatcher.h" +#include "itkTestingMacros.h" int itkMaskedImageToHistogramFilterTest1(int argc, char * argv[]) @@ -33,7 +34,7 @@ itkMaskedImageToHistogramFilterTest1(int argc, char * argv[]) if (argc < 6) { std::cerr << "Missing command line arguments" << std::endl; - std::cerr << "Usage : " << argv[0] + std::cerr << "Usage : " << itkNameOfTestExecutableMacro(argv) << " inputImageFileName inputImageFileName maskImage maskValue outputHistogramFile" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Nonunit/Review/test/itkFastApproximateRankImageFilterTest.cxx b/Modules/Nonunit/Review/test/itkFastApproximateRankImageFilterTest.cxx index 0b49936d73e..a514d048507 100644 --- a/Modules/Nonunit/Review/test/itkFastApproximateRankImageFilterTest.cxx +++ b/Modules/Nonunit/Review/test/itkFastApproximateRankImageFilterTest.cxx @@ -33,7 +33,7 @@ itkFastApproximateRankImageFilterTest(int argc, char * argv[]) if (argc < 4) { std::cerr << "Missing parameters." << std::endl; - std::cerr << "Usage: " << argv[0] << " InputImage BaselineImage radius" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage BaselineImage radius" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx b/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx index c8563c23636..5f6dac98b8a 100644 --- a/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx @@ -20,6 +20,7 @@ #include "itkFEMSpatialObjectReader.h" #include "itkFEMLinearSystemWrapperDenseVNL.h" #include "itkFEMLinearSystemWrapperItpack.h" +#include "itkTestingMacros.h" using FEMSolverType = itk::fem::SolverHyperbolic<2>; @@ -152,7 +153,7 @@ itkFEMSolverHyperbolicTest(int argc, char * argv[]) if (argc < 4) { - std::cout << "Usage: " << argv[0]; + std::cout << "Usage: " << itkNameOfTestExecutableMacro(argv); std::cout << " input-file iterations lsw (0=VNL, 1=Dense VNL, 2=Itpack)"; std::cout << std::endl; return EXIT_FAILURE; diff --git a/Modules/Registration/FEM/test/itkFEMFiniteDifferenceFunctionLoadTest.cxx b/Modules/Registration/FEM/test/itkFEMFiniteDifferenceFunctionLoadTest.cxx index faa6202756c..2839b6936bb 100644 --- a/Modules/Registration/FEM/test/itkFEMFiniteDifferenceFunctionLoadTest.cxx +++ b/Modules/Registration/FEM/test/itkFEMFiniteDifferenceFunctionLoadTest.cxx @@ -353,7 +353,7 @@ itkFEMFiniteDifferenceFunctionLoadTest(int argc, char * argv[]) if (argc != 2) { std::cerr << "Missing Parameters" << std::endl; - std::cerr << "Usage: " << argv[0] << " outputFilenamePrefix" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " outputFilenamePrefix" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Registration/FEM/test/itkPhysicsBasedNonRigidRegistrationMethodTest.cxx b/Modules/Registration/FEM/test/itkPhysicsBasedNonRigidRegistrationMethodTest.cxx index 129ed6b8e36..0ef943809e4 100644 --- a/Modules/Registration/FEM/test/itkPhysicsBasedNonRigidRegistrationMethodTest.cxx +++ b/Modules/Registration/FEM/test/itkPhysicsBasedNonRigidRegistrationMethodTest.cxx @@ -36,7 +36,7 @@ itkPhysicsBasedNonRigidRegistrationMethodTest(int argc, char * argv[]) if (argc != 12) { std::cerr << "Missing Parameters" << std::endl; - std::cerr << "Usage: " << argv[0] << " fixedImageFile" + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " fixedImageFile" << " movingImageFile" << " maskImageFile" << " meshFile" diff --git a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx index b18c3292506..e44634c468c 100644 --- a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx @@ -41,6 +41,7 @@ #include "itkGPUContextManager.h" #include "itkGPUDemonsRegistrationFilter.h" #include "itkMacro.h" +#include "itkTestingMacros.h" namespace { @@ -112,7 +113,7 @@ itkGPUDemonsRegistrationFilterTest(int argc, char * argv[]) if (argc < 6) { std::cerr << "Missing Parameters " << std::endl; - std::cerr << "Usage: " << argv[0]; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv); std::cerr << " imageDimension numOfIterations "; std::cerr << " fixedImageFile movingImageFile "; std::cerr << " outputImageFile " << std::endl; diff --git a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx index 0b871e0cae2..b2e49907127 100644 --- a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx +++ b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx @@ -24,6 +24,7 @@ #include "itkCommand.h" #include "itkCastImageFilter.h" #include "itkImageFileWriter.h" +#include "itkTestingMacros.h" namespace @@ -111,7 +112,7 @@ itkGPUDemonsRegistrationFilterTest2(int argc, char * argv[]) if (argc < 3) { std::cerr << "Missing Parameters " << std::endl; - std::cerr << "Usage: " << argv[0]; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv); std::cerr << " fixedImageFile warpedOutputImageFile" << std::endl; } diff --git a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeGrayScaleTest.cxx b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeGrayScaleTest.cxx index b4f15c43db8..24811f81206 100644 --- a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeGrayScaleTest.cxx +++ b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeGrayScaleTest.cxx @@ -24,6 +24,7 @@ #include "itkImageRegionConstIteratorWithIndex.h" #include "itkOpenCVVideoIOFactory.h" #include "itkOpenCVTestHelper.h" +#include "itkTestingMacros.h" #if defined(CV_VERSION_EPOCH) // OpenCV 2.4.x # include "highgui.h" @@ -244,7 +245,8 @@ itkOpenCVImageBridgeGrayScaleTest(int argc, char * argv[]) // if (argc != 4) { - std::cerr << "Usage: " << argv[0] << "scalar_image1 scalar_image2 scalar_image3" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << "scalar_image1 scalar_image2 scalar_image3" + << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx index 0fd097d657d..5778f4931d4 100644 --- a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx +++ b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx @@ -23,6 +23,7 @@ #include "itkImageRegionConstIteratorWithIndex.h" #include "itkOpenCVVideoIOFactory.h" #include "itkOpenCVTestHelper.h" +#include "itkTestingMacros.h" #if defined(CV_VERSION_EPOCH) // OpenCV 2.4.x # include "highgui.h" @@ -285,7 +286,8 @@ itkOpenCVImageBridgeRGBTest(int argc, char * argv[]) // if (argc != 4) { - std::cerr << "Usage: " << argv[0] << "rgb_jpg_image rgb_mha_image rgb_image2" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << "rgb_jpg_image rgb_mha_image rgb_image2" + << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Video/BridgeOpenCV/test/itkOpenCVVideoCaptureTest.cxx b/Modules/Video/BridgeOpenCV/test/itkOpenCVVideoCaptureTest.cxx index 64a7ad2b61c..08de172a10e 100644 --- a/Modules/Video/BridgeOpenCV/test/itkOpenCVVideoCaptureTest.cxx +++ b/Modules/Video/BridgeOpenCV/test/itkOpenCVVideoCaptureTest.cxx @@ -21,6 +21,7 @@ #include "itkOpenCVVideoCapture.h" #include "itkVideoFileReader.h" #include "itkOpenCVVideoIOFactory.h" +#include "itkTestingMacros.h" #include "opencv2/core/version.hpp" #if !defined(CV_VERSION_EPOCH) @@ -50,7 +51,7 @@ itkOpenCVVideoCaptureTest(int argc, char * argv[]) // if (argc != 6) { - std::cerr << "Usage: " << argv[0] << " input_video scalar_output_video RGB_output_video " + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " input_video scalar_output_video RGB_output_video " << "width height" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Video/BridgeVXL/test/vidl_itk_istreamTest.cxx b/Modules/Video/BridgeVXL/test/vidl_itk_istreamTest.cxx index f366814ffc1..3b30d610c62 100644 --- a/Modules/Video/BridgeVXL/test/vidl_itk_istreamTest.cxx +++ b/Modules/Video/BridgeVXL/test/vidl_itk_istreamTest.cxx @@ -20,6 +20,7 @@ #include "vidl_itk_istream.hxx" #include "itkVideoFileReader.h" #include "itkVXLVideoIOFactory.h" +#include "itkTestingMacros.h" #include "vidl/vidl_ffmpeg_ostream.h" @@ -134,7 +135,7 @@ vidl_itk_istreamTest(int argc, char * argv[]) // if (argc < 5) { - std::cerr << "Usage: " << argv[0] << " input_file output_file width height" << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " input_file output_file width height" << std::endl; return EXIT_FAILURE; }