From 46dbe435f7855608982f09608f7dc29988757fbd Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 29 Mar 2019 13:39:29 -0400 Subject: [PATCH 1/2] BUG: Add missing ITKImageGrid circle.png content links --- Modules/Filtering/ImageGrid/test/CMakeLists.txt | 4 ++-- Modules/Filtering/ImageGrid/test/Input/circle.png.md5 | 1 + Modules/Filtering/ImageGrid/test/Input/circle.png.sha512 | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Modules/Filtering/ImageGrid/test/Input/circle.png.md5 create mode 100644 Modules/Filtering/ImageGrid/test/Input/circle.png.sha512 diff --git a/Modules/Filtering/ImageGrid/test/CMakeLists.txt b/Modules/Filtering/ImageGrid/test/CMakeLists.txt index 55e3617627f..a7f7e7bf6c1 100644 --- a/Modules/Filtering/ImageGrid/test/CMakeLists.txt +++ b/Modules/Filtering/ImageGrid/test/CMakeLists.txt @@ -245,7 +245,7 @@ itk_add_test(NAME itkResampleImageTest2UseRefImageOff --compare DATA{Baseline/ResampleImageTest2NearestExtrapolateUseRefImageOff.png} ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2dUseRefImageOff.png itkResampleImageTest2 DATA{${ITK_DATA_ROOT}/Input/cthead1.png} - DATA{${ITK_DATA_ROOT}/Input/circle.png} + DATA{Input/circle.png} ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2aUseRefImageOff.png ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2bUseRefImageOff.png ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2cUseRefImageOff.png @@ -262,7 +262,7 @@ itk_add_test(NAME itkResampleImageTest2UseRefImageOn --compare DATA{Baseline/ResampleImageTest2NearestExtrapolateUseRefImageOn.png} ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2dUseRefImageOn.png itkResampleImageTest2 DATA{${ITK_DATA_ROOT}/Input/cthead1.png} - DATA{${ITK_DATA_ROOT}/Input/circle.png} + DATA{Input/circle.png} ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2aUseRefImageOn.png ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2bUseRefImageOn.png ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2cUseRefImageOn.png diff --git a/Modules/Filtering/ImageGrid/test/Input/circle.png.md5 b/Modules/Filtering/ImageGrid/test/Input/circle.png.md5 new file mode 100644 index 00000000000..a3eb75c5b0b --- /dev/null +++ b/Modules/Filtering/ImageGrid/test/Input/circle.png.md5 @@ -0,0 +1 @@ +dc5d096627c279a4334e1cc94229eda9 diff --git a/Modules/Filtering/ImageGrid/test/Input/circle.png.sha512 b/Modules/Filtering/ImageGrid/test/Input/circle.png.sha512 new file mode 100644 index 00000000000..1c8e76d3dde --- /dev/null +++ b/Modules/Filtering/ImageGrid/test/Input/circle.png.sha512 @@ -0,0 +1 @@ +f56a50a480cebfe968f953f010bcc385b45648788ca3ac9fff9abcfbc9923bd7c5240c6a27701a3494e790030d0d2f168618e08de94b3b442428fe46efe6bfa5 From 1c65dfb76474b0b8828f4bec2a50ad65db2dd66a Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 29 Mar 2019 15:44:44 -0400 Subject: [PATCH 2/2] BUG: itkResampleImageTest2Streaming verification Fix expected number of streaming updates. Fix output file names to correspond with comparison and not clobber itkResampleImageTest2 output file names. Disable baseline until consistency is improved per Issue #655. --- Modules/Filtering/ImageGrid/test/CMakeLists.txt | 16 ++++++++-------- .../test/itkResampleImageTest2Streaming.cxx | 4 +--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Modules/Filtering/ImageGrid/test/CMakeLists.txt b/Modules/Filtering/ImageGrid/test/CMakeLists.txt index a7f7e7bf6c1..9c213e9d784 100644 --- a/Modules/Filtering/ImageGrid/test/CMakeLists.txt +++ b/Modules/Filtering/ImageGrid/test/CMakeLists.txt @@ -270,14 +270,14 @@ itk_add_test(NAME itkResampleImageTest2UseRefImageOn 1) itk_add_test(NAME itkResampleImageTest2Streaming COMMAND ITKImageGridTestDriver - --compare DATA{Baseline/ResampleImageTest2.mha} - ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2a.mha - --compare DATA{Baseline/ResampleImageTest2.mha} - ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2b.mha - --compare DATA{Baseline/ResampleImageTest2NearestExtrapolate.mha} - ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2c.mha - --compare DATA{Baseline/ResampleImageTest2NearestExtrapolate.mha} - ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2d.mha + #--compare DATA{Baseline/ResampleImageTest2.mha} + #${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2aStreaming.mha + #--compare DATA{Baseline/ResampleImageTest2.mha} + #${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2bStreaming.mha + #--compare DATA{Baseline/ResampleImageTest2NearestExtrapolate.mha} + #${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2cStreaming.mha + #--compare DATA{Baseline/ResampleImageTest2NearestExtrapolate.mha} + #${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2dStreaming.mha itkResampleImageTest2Streaming DATA{Input/cthead1.mha} DATA{Input/circle.png} ${ITK_TEST_OUTPUT_DIR}/ResampleImageTest2aStreaming.mha diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx index 92bc68d66eb..76406bc0f8c 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx @@ -155,9 +155,7 @@ int itkResampleImageTest2Streaming( int argc, char * argv [] ) monitor->ClearPipelineSavedInformation(); TRY_EXPECT_NO_EXCEPTION( writer1->Update() ); - // Note: We will only request the input 4 times because that last sampled - // chunk is completely outside the input and not requested - if( !monitor->VerifyInputFilterExecutedStreaming(4) ) + if( !monitor->VerifyInputFilterExecutedStreaming(8) ) { std::cerr << "Streaming failed to execute as expected!" << std::endl; std::cerr << monitor;