diff --git a/Modules/Filtering/ImageCompose/test/itkCompose2DCovariantVectorImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkCompose2DCovariantVectorImageFilterTest.cxx index 8a58d45cc0e..89c03be7b45 100644 --- a/Modules/Filtering/ImageCompose/test/itkCompose2DCovariantVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkCompose2DCovariantVectorImageFilterTest.cxx @@ -19,6 +19,7 @@ #include #include "itkComposeImageFilter.h" #include "itkMath.h" +#include "itkTestingMacros.h" int itkCompose2DCovariantVectorImageFilterTest(int, char *[]) @@ -63,17 +64,7 @@ itkCompose2DCovariantVectorImageFilterTest(int, char *[]) filter->SetInput1(zeroImage); filter->SetInput2(oneImage); - try - { - filter->Update(); - } - - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); using OutputImageType = FilterType::OutputImageType; @@ -112,7 +103,6 @@ itkCompose2DCovariantVectorImageFilterTest(int, char *[]) ++i1; } - std::cout << "Test Passed !" << std::endl; - + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkCompose2DVectorImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkCompose2DVectorImageFilterTest.cxx index 97c32885df7..47ac23eb21d 100644 --- a/Modules/Filtering/ImageCompose/test/itkCompose2DVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkCompose2DVectorImageFilterTest.cxx @@ -19,6 +19,7 @@ #include #include "itkComposeImageFilter.h" #include "itkMath.h" +#include "itkTestingMacros.h" int itkCompose2DVectorImageFilterTest(int, char *[]) @@ -63,16 +64,7 @@ itkCompose2DVectorImageFilterTest(int, char *[]) filter->SetInput1(zeroImage); filter->SetInput2(oneImage); - try - { - filter->Update(); - } - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); using OutputImageType = FilterType::OutputImageType; @@ -111,7 +103,6 @@ itkCompose2DVectorImageFilterTest(int, char *[]) ++i1; } - std::cout << "Test Passed !" << std::endl; - + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkCompose3DCovariantVectorImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkCompose3DCovariantVectorImageFilterTest.cxx index 4741669b11f..829acba7f8a 100644 --- a/Modules/Filtering/ImageCompose/test/itkCompose3DCovariantVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkCompose3DCovariantVectorImageFilterTest.cxx @@ -19,6 +19,7 @@ #include #include "itkComposeImageFilter.h" #include "itkMath.h" +#include "itkTestingMacros.h" int itkCompose3DCovariantVectorImageFilterTest(int, char *[]) @@ -69,17 +70,7 @@ itkCompose3DCovariantVectorImageFilterTest(int, char *[]) filter->SetInput2(oneImage); filter->SetInput3(twoImage); - try - { - filter->Update(); - } - - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); using OutputImageType = FilterType::OutputImageType; @@ -126,7 +117,6 @@ itkCompose3DCovariantVectorImageFilterTest(int, char *[]) ++i2; } - std::cout << "Test Passed !" << std::endl; - + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkCompose3DVectorImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkCompose3DVectorImageFilterTest.cxx index c979d8e6c6a..0193c54dbe9 100644 --- a/Modules/Filtering/ImageCompose/test/itkCompose3DVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkCompose3DVectorImageFilterTest.cxx @@ -19,6 +19,7 @@ #include #include "itkComposeImageFilter.h" #include "itkMath.h" +#include "itkTestingMacros.h" int itkCompose3DVectorImageFilterTest(int, char *[]) @@ -68,16 +69,7 @@ itkCompose3DVectorImageFilterTest(int, char *[]) filter->SetInput2(oneImage); filter->SetInput3(twoImage); - try - { - filter->Update(); - } - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); using OutputImageType = FilterType::OutputImageType; @@ -124,7 +116,6 @@ itkCompose3DVectorImageFilterTest(int, char *[]) ++i2; } - std::cout << "Test Passed !" << std::endl; - + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkComposeRGBAImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkComposeRGBAImageFilterTest.cxx index b8b24b08936..8711133b3e8 100644 --- a/Modules/Filtering/ImageCompose/test/itkComposeRGBAImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkComposeRGBAImageFilterTest.cxx @@ -31,80 +31,64 @@ itkComposeRGBAImageFilterTest(int argc, char * argv[]) if (argc < 6) { - std::cerr << "Error: missing arguments" << std::endl; + std::cerr << "Missing parameters." << std::endl; std::cerr << "Usage: " << std::endl; std::cerr << itkNameOfTestExecutableMacro(argv) << " outputFile inputFileR inputFileG inputFileB inputFileA" << std::endl; } - try - { - // ARGUMENTS: - // argv[0] = Executable name - // argv[1] = Output file name and path - // argv[2] = Input 1 file name and path - // argv[2] = Input 2 file name and path - // argv[2] = Input 3 file name and path - // argv[2] = Input 4 file name and path + // Get arguments + char * OutputFilename = argv[1]; + char * Input1Filename = argv[2]; + char * Input2Filename = argv[3]; + char * Input3Filename = argv[4]; + char * Input4Filename = argv[5]; - // Get arguments - char * OutputFilename = argv[1]; - char * Input1Filename = argv[2]; - char * Input2Filename = argv[3]; - char * Input3Filename = argv[4]; - char * Input4Filename = argv[5]; + // Typedefs + using ScalarPixelType = unsigned char; + constexpr unsigned int Dimension = 2; + using RGBAPixelType = itk::RGBAPixel; + using ScalarImageType = itk::Image; + using RGBAImageType = itk::Image; + using ReaderType = itk::ImageFileReader; + using WriterType = itk::ImageFileWriter; + using ComposeFilterType = itk::ComposeImageFilter; - // Typedefs - using ScalarPixelType = unsigned char; - constexpr unsigned int Dimension = 2; - using RGBAPixelType = itk::RGBAPixel; - using ScalarImageType = itk::Image; - using RGBAImageType = itk::Image; - using ReaderType = itk::ImageFileReader; - using WriterType = itk::ImageFileWriter; - using ComposeFilterType = itk::ComposeImageFilter; + // Read input1 + auto reader1 = ReaderType::New(); + reader1->SetFileName(Input1Filename); + reader1->Update(); - // Read input1 - auto reader1 = ReaderType::New(); - reader1->SetFileName(Input1Filename); - reader1->Update(); + // Read input2 + auto reader2 = ReaderType::New(); + reader2->SetFileName(Input2Filename); + reader2->Update(); - // Read input2 - auto reader2 = ReaderType::New(); - reader2->SetFileName(Input2Filename); - reader2->Update(); + // Read input3 + auto reader3 = ReaderType::New(); + reader3->SetFileName(Input3Filename); + reader3->Update(); - // Read input3 - auto reader3 = ReaderType::New(); - reader3->SetFileName(Input3Filename); - reader3->Update(); + // Read input4 + auto reader4 = ReaderType::New(); + reader4->SetFileName(Input4Filename); + reader4->Update(); - // Read input4 - auto reader4 = ReaderType::New(); - reader4->SetFileName(Input4Filename); - reader4->Update(); + // Test ComposeRGBA filter + auto filterCompose = ComposeFilterType::New(); + filterCompose->SetInput(0, reader1->GetOutput()); + filterCompose->SetInput(1, reader2->GetOutput()); + filterCompose->SetInput(2, reader3->GetOutput()); + filterCompose->SetInput(3, reader4->GetOutput()); - // Test ComposeRGBA filter - auto filterCompose = ComposeFilterType::New(); - filterCompose->SetInput(0, reader1->GetOutput()); - filterCompose->SetInput(1, reader2->GetOutput()); - filterCompose->SetInput(2, reader3->GetOutput()); - filterCompose->SetInput(3, reader4->GetOutput()); - filterCompose->Update(); + ITK_TRY_EXPECT_NO_EXCEPTION(filterCompose->Update()); - // Write output - auto writer = WriterType::New(); - writer->SetFileName(OutputFilename); - writer->SetInput(filterCompose->GetOutput()); - writer->Update(); - } - catch (const itk::ExceptionObject & err) - { - std::cerr << "ExceptionObject caught !" << std::endl; - std::cerr << err << std::endl; - return EXIT_FAILURE; - } + // Write output + auto writer = WriterType::New(); + writer->SetFileName(OutputFilename); + writer->SetInput(filterCompose->GetOutput()); + writer->Update(); - // Return + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkComposeRGBImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkComposeRGBImageFilterTest.cxx index b54eaf69919..59560971762 100644 --- a/Modules/Filtering/ImageCompose/test/itkComposeRGBImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkComposeRGBImageFilterTest.cxx @@ -19,6 +19,7 @@ #include #include "itkRGBPixel.h" #include "itkComposeImageFilter.h" +#include "itkTestingMacros.h" int itkComposeRGBImageFilterTest(int, char *[]) @@ -69,17 +70,7 @@ itkComposeRGBImageFilterTest(int, char *[]) filter->SetInput2(greenImage); filter->SetInput3(blueImage); - try - { - filter->Update(); - } - - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Exception caught !" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); const OutputImageType::Pointer rgbImage = filter->GetOutput(); @@ -124,7 +115,6 @@ itkComposeRGBImageFilterTest(int, char *[]) ++ib; } - std::cout << "Test Passed !" << std::endl; - + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkImageReadRealAndImaginaryWriteComplexTest.cxx b/Modules/Filtering/ImageCompose/test/itkImageReadRealAndImaginaryWriteComplexTest.cxx index 86ed21be425..c4eade18bca 100644 --- a/Modules/Filtering/ImageCompose/test/itkImageReadRealAndImaginaryWriteComplexTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkImageReadRealAndImaginaryWriteComplexTest.cxx @@ -40,6 +40,7 @@ itkImageReadRealAndImaginaryWriteComplexTest(int argc, char * argv[]) { if (argc != 4) { + std::cerr << "Missing parameters." << std::endl; std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " inputReal inputImaginary outputComplex" << std::endl; return EXIT_FAILURE; @@ -60,7 +61,7 @@ itkImageReadRealAndImaginaryWriteComplexTest(int argc, char * argv[]) auto readerImag = ReaderType::New(); auto writer = WriterType::New(); - auto RealAndImaginary2Complex = RealAndImaginary2ComplexFilterType::New(); + auto realAndImaginary2Complex = RealAndImaginary2ComplexFilterType::New(); readerReal->SetFileName(argv[1]); readerImag->SetFileName(argv[2]); @@ -70,21 +71,13 @@ itkImageReadRealAndImaginaryWriteComplexTest(int argc, char * argv[]) readerReal->Update(); readerImag->Update(); - RealAndImaginary2Complex->SetInput1(readerReal->GetOutput()); - RealAndImaginary2Complex->SetInput2(readerImag->GetOutput()); + realAndImaginary2Complex->SetInput1(readerReal->GetOutput()); + realAndImaginary2Complex->SetInput2(readerImag->GetOutput()); - writer->SetInput(RealAndImaginary2Complex->GetOutput()); + ITK_TRY_EXPECT_NO_EXCEPTION(realAndImaginary2Complex->Update()); - try - { - writer->Update(); - } - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Error writing the magnitude image: " << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } + writer->SetInput(realAndImaginary2Complex->GetOutput()); + writer->Update(); // check that the default template parameters work using DefaultParametersFilterType = itk::ComposeImageFilter; @@ -93,5 +86,7 @@ itkImageReadRealAndImaginaryWriteComplexTest(int argc, char * argv[]) { return EXIT_FAILURE; } + + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkImageToVectorImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkImageToVectorImageFilterTest.cxx index 92450c0d64d..802d88ebaeb 100644 --- a/Modules/Filtering/ImageCompose/test/itkImageToVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkImageToVectorImageFilterTest.cxx @@ -25,6 +25,13 @@ int itkImageToVectorImageFilterTest(int argc, char * argv[]) { + if (argc < 3) + { + std::cerr << "Missing parameters." << std::endl; + std::cerr << "Usage: " << std::endl; + std::cerr << itkNameOfTestExecutableMacro(argv) << " input1 input2 ... inputn output" << std::endl; + return EXIT_FAILURE; + } using PixelType = unsigned char; @@ -36,13 +43,6 @@ itkImageToVectorImageFilterTest(int argc, char * argv[]) using FilterType = itk::ComposeImageFilter; - if (argc < 3) - { - std::cerr << "Usage: " << std::endl; - std::cerr << itkNameOfTestExecutableMacro(argv) << " input1 input2 ... inputn output" << std::endl; - return EXIT_FAILURE; - } - auto filter = FilterType::New(); int f = 0; for (int i = 1; i < argc - 1; ++i) @@ -53,20 +53,14 @@ itkImageToVectorImageFilterTest(int argc, char * argv[]) filter->SetInput(f++, reader->GetOutput()); } + ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update()); + auto writer = WriterType::New(); writer->SetFileName(argv[argc - 1]); + writer->SetInput(filter->GetOutput()); + writer->Update(); - try - { - writer->SetInput(filter->GetOutput()); - writer->Update(); - } - catch (const itk::ExceptionObject & excp) - { - std::cerr << "Error while writing the file" << std::endl; - std::cerr << excp << std::endl; - return EXIT_FAILURE; - } - std::cout << "Test passed." << std::endl; + + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkJoinImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkJoinImageFilterTest.cxx index 09c0388ea41..03d534610f2 100644 --- a/Modules/Filtering/ImageCompose/test/itkJoinImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkJoinImageFilterTest.cxx @@ -252,6 +252,6 @@ itkJoinImageFilterTest(int, char *[]) } - // All objects should be automatically destroyed at this point + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterStreamingTest.cxx b/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterStreamingTest.cxx index 30c4b3fc209..aa9c3107d4c 100644 --- a/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterStreamingTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterStreamingTest.cxx @@ -27,6 +27,13 @@ int itkJoinSeriesImageFilterStreamingTest(int argc, char * argv[]) { + if (argc < 3) + { + std::cerr << "Missing parameters." << std::endl; + std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage OutputImage" << std::endl; + return EXIT_FAILURE; + } + using ImageType = itk::Image; using SliceImageType = itk::Image; @@ -35,14 +42,6 @@ itkJoinSeriesImageFilterStreamingTest(int argc, char * argv[]) using JoinSeriesFilterType = itk::JoinSeriesImageFilter; using ImageFileWriterType = itk::ImageFileWriter; - - if (argc < 3) - { - std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage OutputImage" << std::endl; - return EXIT_FAILURE; - } - - const std::string inputFileName = argv[1]; const std::string outputFileName = argv[2]; @@ -95,16 +94,7 @@ itkJoinSeriesImageFilterStreamingTest(int argc, char * argv[]) writer->SetFileName(outputFileName); writer->SetNumberOfStreamDivisions(numberOfSlices); - - try - { - writer->Update(); - } - catch (...) - { - std::cerr << "Exception while trying to stream write file." << std::endl; - throw; - } + ITK_TRY_EXPECT_NO_EXCEPTION(writer->Update()); std::cout << "Number of Updates: " << monitor1->GetNumberOfUpdates() << std::endl; std::cout << "Verifying ImageFileReader to ExtractImageFilter pipeline interaction" << std::endl; @@ -125,5 +115,6 @@ itkJoinSeriesImageFilterStreamingTest(int argc, char * argv[]) return EXIT_FAILURE; } + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } diff --git a/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterTest.cxx b/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterTest.cxx index cbd9707bc27..04fa5de8b50 100644 --- a/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompose/test/itkJoinSeriesImageFilterTest.cxx @@ -224,6 +224,6 @@ itkJoinSeriesImageFilterTest(int, char *[]) } - std::cout << "Test passed." << std::endl; + std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; }