From 86deecf1df917843c21dc5e7b06f5800baa1bf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Fri, 24 Dec 2021 11:05:38 -0500 Subject: [PATCH 1/2] ENH: Increase coverage for `ImageStatistics` module classes Increase coverage for `ImageStatistics` module classes: - Exercise the basic object methods using the `ITK_EXERCISE_BASIC_OBJECT_METHODS` macro. --- .../test/itkLabelOverlapMeasuresImageFilterTest.cxx | 4 ++++ .../test/itkLabelStatisticsImageFilterTest.cxx | 3 +++ .../test/itkMinimumMaximumImageFilterTest.cxx | 7 ++++++- .../ImageStatistics/test/itkStatisticsImageFilterTest.cxx | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Modules/Filtering/ImageStatistics/test/itkLabelOverlapMeasuresImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkLabelOverlapMeasuresImageFilterTest.cxx index d9e913731a9..afe1a236584 100644 --- a/Modules/Filtering/ImageStatistics/test/itkLabelOverlapMeasuresImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkLabelOverlapMeasuresImageFilterTest.cxx @@ -37,6 +37,10 @@ LabelOverlapMeasures(int, char * argv[]) using FilterType = itk::LabelOverlapMeasuresImageFilter; auto filter = FilterType::New(); + + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, LabelOverlapMeasuresImageFilter, ImageToImageFilter); + + filter->SetSourceImage(reader1->GetOutput()); filter->SetTargetImage(reader2->GetOutput()); filter->Update(); diff --git a/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx index 14cd24e0bd4..8d20b6db84a 100644 --- a/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx @@ -59,6 +59,9 @@ itkLabelStatisticsImageFilterTest(int argc, char * argv[]) auto filter = FilterType::New(); + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, LabelStatisticsImageFilter, ImageToImageFilter); + + itk::SimpleFilterWatcher filterWatch(filter); filter->SetInput(reader1->GetOutput()); diff --git a/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx index 464de9abf78..2f027f44db1 100644 --- a/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx @@ -20,6 +20,7 @@ #include "itkSimpleFilterWatcher.h" #include "itkMacro.h" #include "itkMath.h" +#include "itkTestingMacros.h" int itkMinimumMaximumImageFilterTest(int, char *[]) @@ -77,7 +78,11 @@ itkMinimumMaximumImageFilterTest(int, char *[]) image->SetPixel(index, maximum); // Create and initialize the filter - auto filter = MinMaxFilterType::New(); + auto filter = MinMaxFilterType::New(); + + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, MinimumMaximumImageFilter, ImageToImageFilter); + + itk::SimpleFilterWatcher watcher(filter); filter->SetInput(image); diff --git a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx index e4dc40160ca..2b0c75144dc 100644 --- a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx @@ -68,6 +68,9 @@ itkStatisticsImageFilterTest(int argc, char * argv[]) using FilterType = itk::StatisticsImageFilter; auto filter = FilterType::New(); + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, StatisticsImageFilter, ImageToImageFilter); + + itk::SimpleFilterWatcher filterWatch(filter); filter->SetInput(image); From 17e4773ccd1ffbc6e372bb31aca68665b8ab54d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Fri, 24 Dec 2021 10:55:43 -0500 Subject: [PATCH 2/2] BUG: Fix superclass name in `itkTypeMacro` Fix `ImageStatistics` module classes superclass name in `itkTypeMacro`. --- .../ImageStatistics/include/itkLabelStatisticsImageFilter.h | 2 +- .../ImageStatistics/include/itkMinimumMaximumImageFilter.h | 2 +- .../ImageStatistics/include/itkStatisticsImageFilter.h | 2 +- .../ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx | 2 +- .../ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx | 2 +- .../ImageStatistics/test/itkStatisticsImageFilterTest.cxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h index 48ec78d1dca..7b9eecd6888 100644 --- a/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h +++ b/Modules/Filtering/ImageStatistics/include/itkLabelStatisticsImageFilter.h @@ -74,7 +74,7 @@ class ITK_TEMPLATE_EXPORT LabelStatisticsImageFilter : public ImageSink itkNewMacro(Self); /** Runtime information support. */ - itkTypeMacro(StatisticsImageFilter, ImageToImageFilter); + itkTypeMacro(StatisticsImageFilter, ImageSink); /** Image related type alias. */ using InputImagePointer = typename TInputImage::Pointer; diff --git a/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx index 8d20b6db84a..01644b61a33 100644 --- a/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkLabelStatisticsImageFilterTest.cxx @@ -59,7 +59,7 @@ itkLabelStatisticsImageFilterTest(int argc, char * argv[]) auto filter = FilterType::New(); - ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, LabelStatisticsImageFilter, ImageToImageFilter); + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, LabelStatisticsImageFilter, ImageSink); itk::SimpleFilterWatcher filterWatch(filter); diff --git a/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx index 2f027f44db1..3e6042e64b5 100644 --- a/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkMinimumMaximumImageFilterTest.cxx @@ -80,7 +80,7 @@ itkMinimumMaximumImageFilterTest(int, char *[]) // Create and initialize the filter auto filter = MinMaxFilterType::New(); - ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, MinimumMaximumImageFilter, ImageToImageFilter); + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, MinimumMaximumImageFilter, ImageSink); itk::SimpleFilterWatcher watcher(filter); diff --git a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx index 2b0c75144dc..ddc2da1d8f2 100644 --- a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx @@ -68,7 +68,7 @@ itkStatisticsImageFilterTest(int argc, char * argv[]) using FilterType = itk::StatisticsImageFilter; auto filter = FilterType::New(); - ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, StatisticsImageFilter, ImageToImageFilter); + ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, StatisticsImageFilter, ImageSink); itk::SimpleFilterWatcher filterWatch(filter);