From b235f1ebdf6f98f59849ea52eaac4e9ef9f2cb2b Mon Sep 17 00:00:00 2001 From: Antoine Regimbeau <antoine.regimbeau@c-s.fr> Date: Tue, 26 Feb 2019 18:09:26 +0100 Subject: [PATCH] Rename input with .raw from raoul report --- .../AppImageUtils/test/CMakeLists.txt | 4 ++-- Modules/Core/ImageBase/test/CMakeLists.txt | 6 +++--- Modules/Core/ObjectList/test/CMakeLists.txt | 18 ++++++++--------- Modules/Core/PointSet/test/CMakeLists.txt | 8 ++++---- Modules/Core/Transform/test/CMakeLists.txt | 2 +- .../RoadExtraction/test/CMakeLists.txt | 18 ++++++++--------- Modules/Feature/Edge/test/CMakeLists.txt | 2 +- .../ImageManipulation/test/CMakeLists.txt | 2 +- Modules/Filtering/Path/test/CMakeLists.txt | 8 ++++---- Modules/IO/ImageIO/test/CMakeLists.txt | 20 +++++++++---------- .../Registration/Stereo/test/CMakeLists.txt | 13 ++---------- 11 files changed, 46 insertions(+), 55 deletions(-) diff --git a/Modules/Applications/AppImageUtils/test/CMakeLists.txt b/Modules/Applications/AppImageUtils/test/CMakeLists.txt index 338dd1534d..182db8fca0 100644 --- a/Modules/Applications/AppImageUtils/test/CMakeLists.txt +++ b/Modules/Applications/AppImageUtils/test/CMakeLists.txt @@ -261,10 +261,10 @@ otb_test_application(NAME apTvUtConcatenateImages otb_test_application(NAME apTvUtConcatenateImages_1Image APP ConcatenateImages - OPTIONS -il ${INPUTDATA}/poupees_c1 + OPTIONS -il ${INPUTDATA}/poupees_c1.raw -out ${TEMP}/apTvUtConcatenateImages_1Image.tif VALID --compare-image ${NOTOL} - ${INPUTDATA}/poupees_c1 + ${INPUTDATA}/poupees_c1.raw ${TEMP}/apTvUtConcatenateImages_1Image.tif) diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt index e9f92a752c..fa1a342caf 100644 --- a/Modules/Core/ImageBase/test/CMakeLists.txt +++ b/Modules/Core/ImageBase/test/CMakeLists.txt @@ -101,7 +101,7 @@ otb_add_test(NAME bfTvComplexToVectorImageCastFilterTest COMMAND otbImageBaseTes ${BASELINE}/bfTvComplexToVectorImageCastFilterTest.tif ${TEMP}/bfTvVectorComplexToVectorImageCastFilterTest.tif otbComplexToVectorImageCastFilterTest - ${INPUTDATA}/monobandComplexDouble + ${INPUTDATA}/monobandComplexDouble.raw ${TEMP}/bfTvComplexToVectorImageCastFilterTest.tif ${TEMP}/bfTvVectorComplexToVectorImageCastFilterTest.tif ) @@ -135,7 +135,7 @@ otb_add_test(NAME coTvMultiChannelROI_5c_BSQ COMMAND otbImageBaseTestDriver --compare-image ${NOTOL} ${BASELINE}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif otbMultiChannelExtractROI - ${INPUTDATA}/poupees.hdr + ${INPUTDATA}/poupees.raw.hdr ${TEMP}/coMultiChannelExtractROI_RGB_ENVI_poupees_303_2_134_330_channels_12321.tif -startX 303 -startY 2 -sizeX 134 -sizeY 330 -channels 1 2 3 2 1 ) @@ -443,7 +443,7 @@ otb_add_test(NAME ioTvMultiChannelROI_ENVI2PNG_2 COMMAND otbImageBaseTestDriver # --compare-image ${EPSILON_9} ${BASELINE}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png # ${TEMP}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png otbMultiChannelExtractROI - -uchar ${INPUTDATA}/poupees.hdr + -uchar ${INPUTDATA}/poupees.raw.hdr -uchar ${TEMP}/ioExtractROI_ENVI2PNG_poupees_100_100_77_300_channels_1_2_3.png -startX 100 -startY 100 -sizeX 77 -sizeY 300 -channels 1 2 3 ) diff --git a/Modules/Core/ObjectList/test/CMakeLists.txt b/Modules/Core/ObjectList/test/CMakeLists.txt index 4c252dffa9..ba9e991df9 100644 --- a/Modules/Core/ObjectList/test/CMakeLists.txt +++ b/Modules/Core/ObjectList/test/CMakeLists.txt @@ -54,27 +54,27 @@ otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbObjectListTestD ${BASELINE}/bfTvImageListToImageListApplyFilterBand3.png ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png otbImageListToImageListApplyFilter - ${INPUTDATA}/poupees_c1.hdr - ${INPUTDATA}/poupees_c2.hdr - ${INPUTDATA}/poupees_c3.hdr + ${INPUTDATA}/poupees_c1.raw.hdr + ${INPUTDATA}/poupees_c2.raw.hdr + ${INPUTDATA}/poupees_c3.raw.hdr ${TEMP}/bfTvImageListToImageListApplyFilterBand1.png ${TEMP}/bfTvImageListToImageListApplyFilterBand2.png ${TEMP}/bfTvImageListToImageListApplyFilterBand3.png ) otb_add_test(NAME coTvImageListToVectorImageFilter2 COMMAND otbObjectListTestDriver otbImageListToVectorImageFilter2 - ${INPUTDATA}/poupees_c1.hdr - ${INPUTDATA}/poupees_c2.hdr - ${INPUTDATA}/poupees_c3.hdr + ${INPUTDATA}/poupees_c1.raw.hdr + ${INPUTDATA}/poupees_c2.raw.hdr + ${INPUTDATA}/poupees_c3.raw.hdr ) otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbObjectListTestDriver --compare-image ${EPSILON_7} ${BASELINE}/bfTvImageListToVectorImageFilter.png ${TEMP}/coTvImageListToVectorImageFilter.png otbImageListToVectorImageFilter - ${INPUTDATA}/poupees_c1.hdr - ${INPUTDATA}/poupees_c2.hdr - ${INPUTDATA}/poupees_c3.hdr + ${INPUTDATA}/poupees_c1.raw.hdr + ${INPUTDATA}/poupees_c2.raw.hdr + ${INPUTDATA}/poupees_c3.raw.hdr ${TEMP}/coTvImageListToVectorImageFilter.png ) otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbObjectListTestDriver diff --git a/Modules/Core/PointSet/test/CMakeLists.txt b/Modules/Core/PointSet/test/CMakeLists.txt index a33d5ad76e..e3db16762e 100644 --- a/Modules/Core/PointSet/test/CMakeLists.txt +++ b/Modules/Core/PointSet/test/CMakeLists.txt @@ -60,7 +60,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet1 COMMAND otbPointSetTestDriver --compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To255.txt ${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt otbThresholdImageToPointSetTest - ${INPUTDATA}/small_points.hdr + ${INPUTDATA}/small_points.raw.hdr ${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt 0 255 ) @@ -68,7 +68,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet2 COMMAND otbPointSetTestDriver --compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To0.txt ${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt otbThresholdImageToPointSetTest - ${INPUTDATA}/small_points.hdr + ${INPUTDATA}/small_points.raw.hdr ${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt 0 0 ) @@ -76,7 +76,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet3 COMMAND otbPointSetTestDriver --compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_255To255.txt ${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt otbThresholdImageToPointSetTest - ${INPUTDATA}/small_points.hdr + ${INPUTDATA}/small_points.raw.hdr ${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt 255 255 ) @@ -84,7 +84,7 @@ otb_add_test(NAME feTvThresholdImageToPointSet4 COMMAND otbPointSetTestDriver --compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_1To200.txt ${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt otbThresholdImageToPointSetTest - ${INPUTDATA}/small_points.hdr + ${INPUTDATA}/small_points.raw.hdr ${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt 1 200 ) diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt index 63830dc153..ac9dd0cbb7 100644 --- a/Modules/Core/Transform/test/CMakeLists.txt +++ b/Modules/Core/Transform/test/CMakeLists.txt @@ -95,7 +95,7 @@ otb_add_test(NAME bfTvLogPolarTransformResample COMMAND otbTransformTestDriver --compare-image ${EPSILON_7} ${BASELINE}/bfLogPolarTransformResampleOutput.tif ${TEMP}/bfLogPolarTransformResampleOutput.tif otbLogPolarTransformResample - ${INPUTDATA}/circle.hdr + ${INPUTDATA}/circle.raw.hdr ${TEMP}/bfLogPolarTransformResampleOutput.tif ) diff --git a/Modules/Detection/RoadExtraction/test/CMakeLists.txt b/Modules/Detection/RoadExtraction/test/CMakeLists.txt index 9750b26f17..cbab205bcf 100644 --- a/Modules/Detection/RoadExtraction/test/CMakeLists.txt +++ b/Modules/Detection/RoadExtraction/test/CMakeLists.txt @@ -50,7 +50,7 @@ otb_add_test(NAME feTvLikelihoodPathListFilter COMMAND otbRoadExtractionTestDriv ${BASELINE_FILES}/feTvLikelihoodPathOutput.txt ${TEMP}/feTvLikelihoodPathOutput.txt otbLikelihoodPathListFilter - ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr + ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr ${TEMP}/feTvLikelihoodPathOutput.txt 157 335 204 376 | 21 305 35 308 77 354 85 358 | @@ -62,8 +62,8 @@ otb_add_test(NAME feTvRemoveWrongDirectionFilter COMMAND otbRoadExtractionTestDr ${BASELINE}/feTvRemoveWrongDirectionOutput.tif ${TEMP}/feTvRemoveWrongDirectionOutput.tif otbRemoveWrongDirectionFilter - ${INPUTDATA}/InputForRoadDetection_IsolatedRem.hdr - ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr + ${INPUTDATA}/InputForRoadDetection_IsolatedRem.raw.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr ${TEMP}/feTvRemoveWrongDirectionOutput.tif ) @@ -84,7 +84,7 @@ otb_add_test(NAME feTvAlignMV2ITK COMMAND otbRoadExtractionTestDriver --compare-ascii ${EPSILON_3} ${BASELINE_FILES}/feAlign.txt ${TEMP}/feAlign.txt otbAlignImageToPath - ${INPUTDATA}/poupees.hdr + ${INPUTDATA}/poupees.raw.hdr ${TEMP}/feAlign.txt) otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTestDriver @@ -92,8 +92,8 @@ otb_add_test(NAME feTvNonMaxRemovalByDirectionFilter COMMAND otbRoadExtractionTe ${BASELINE}/feTvNonMaxRemovalByDirectionOutput.tif ${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif otbNonMaxRemovalByDirectionFilter - ${INPUTDATA}/InputForRoadDetection_WrongRem.hdr - ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr + ${INPUTDATA}/InputForRoadDetection_WrongRem.raw.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr ${TEMP}/feTvNonMaxRemovalByDirectionOutput.tif ) @@ -157,8 +157,8 @@ otb_add_test(NAME feTvRemoveIsolatedByDirectionFilter COMMAND otbRoadExtractionT ${BASELINE}/feTvRemoveIsolatedByDirectionOutput.tif ${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif otbRemoveIsolatedByDirectionFilter - ${INPUTDATA}/InputForRoadDetectionScalarProductMod.hdr - ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductMod.raw.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr ${TEMP}/feTvRemoveIsolatedByDirectionOutput.tif ) @@ -188,7 +188,7 @@ otb_add_test(NAME feTvNeighborhoodScalarProductFilter COMMAND otbRoadExtractionT ${BASELINE}/feTvNeighborhoodScalarProductDirectionOutput.tif ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.tif otbNeighborhoodScalarProductFilter - ${INPUTDATA}/InputForRoadDetection_SpectralAngle.hdr + ${INPUTDATA}/InputForRoadDetection_SpectralAngle.raw.hdr ${TEMP}/feTvNeighborhoodScalarProductModulusOutput.tif ${TEMP}/feTvNeighborhoodScalarProductDirectionOutput.tif 1.0 diff --git a/Modules/Feature/Edge/test/CMakeLists.txt b/Modules/Feature/Edge/test/CMakeLists.txt index 8f7e5afcb0..687442cbfe 100644 --- a/Modules/Feature/Edge/test/CMakeLists.txt +++ b/Modules/Feature/Edge/test/CMakeLists.txt @@ -246,7 +246,7 @@ otb_add_test(NAME feTvLineRatioLinearAmsters1 COMMAND otbEdgeTestDriver ${BASELINE}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif otbLineRatioDetectorLinear - ${INPUTDATA}/amst_ers1.ima.extrait.419_187_70_66.hdr + ${INPUTDATA}/amst_ers1.ima.extrait.419_187_70_66.raw.hdr ${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.tif ${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.tif 1 2) diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt index b2d6fa66d7..e8317ea378 100644 --- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt +++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt @@ -101,7 +101,7 @@ otb_add_test(NAME coTvImageToVectorImageCastFilter COMMAND otbImageManipulationT ${BASELINE}/coImageToVectorImageCastFilterOutput.tif ${TEMP}/coImageToVectorImageCastFilterOutput.tif otbImageToVectorImageCastFilter - ${INPUTDATA}/poupees.hdr + ${INPUTDATA}/poupees.raw.hdr ${TEMP}/coImageToVectorImageCastFilterOutput.tif ) diff --git a/Modules/Filtering/Path/test/CMakeLists.txt b/Modules/Filtering/Path/test/CMakeLists.txt index c3ed1dead7..7e29200a65 100644 --- a/Modules/Filtering/Path/test/CMakeLists.txt +++ b/Modules/Filtering/Path/test/CMakeLists.txt @@ -170,8 +170,8 @@ otb_add_test(NAME feTvVectorizationPathListFilterImageOutput COMMAND otbPathTest ${BASELINE}/feTvVectorizationPathListOutput.png ${TEMP}/feTvVectorizationPathListOutput.png otbVectorizationPathListFilter - ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr - ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr + ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr ${TEMP}/feTvVectorizationPathListOutputIgnored.txt ${TEMP}/feTvVectorizationPathListOutput.png 0.0001 @@ -182,8 +182,8 @@ otb_add_test(NAME feTvVectorizationPathListFilterAsciiOutput COMMAND otbPathTest ${BASELINE_FILES}/feTvVectorizationPathListOutput.txt ${TEMP}/feTvVectorizationPathListOutput.txt otbVectorizationPathListFilter - ${INPUTDATA}/InputForRoadDetection_NonMaxRem.hdr - ${INPUTDATA}/InputForRoadDetectionScalarProductDir.hdr + ${INPUTDATA}/InputForRoadDetection_NonMaxRem.raw.hdr + ${INPUTDATA}/InputForRoadDetectionScalarProductDir.raw.hdr ${TEMP}/feTvVectorizationPathListOutput.txt ${TEMP}/feTvVectorizationPathListOutputIgnored.png 0.0005 diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt index 2a8c8d1e7e..b5f23c7e55 100644 --- a/Modules/IO/ImageIO/test/CMakeLists.txt +++ b/Modules/IO/ImageIO/test/CMakeLists.txt @@ -158,10 +158,10 @@ otb_add_test(NAME ioTvImageMetadataWriterTest_TIF COMMAND otbImageIOTestDriver ) otb_add_test(NAME ioTvImageFileReaderRGB_BSQ2PNG COMMAND otbImageIOTestDriver - --compare-image ${EPSILON_9} ${INPUTDATA}/poupees.hdr + --compare-image ${EPSILON_9} ${INPUTDATA}/poupees.raw.hdr ${TEMP}/ioImageFileReaderRGB_BSQ2PNG_poupees.png otbImageFileReaderRGBTest - ${INPUTDATA}/poupees.hdr + ${INPUTDATA}/poupees.raw.hdr ${TEMP}/ioImageFileReaderRGB_BSQ2PNG_poupees.png ) otb_add_test(NAME ioTvImageFileReaderRGB_Gdal_SPOT5TIF2PNG COMMAND otbImageIOTestDriver @@ -252,10 +252,10 @@ otb_add_test(NAME ioTvImageReaderWriterRgbJPEG2PNG COMMAND otbImageIOTestDriver ${TEMP}/ioImageReaderWriterRgbJPEG2PNG_couleurs.png ) otb_add_test(NAME ioTvImageFileReaderRGB_BSQ2TIFF COMMAND otbImageIOTestDriver - --compare-image ${EPSILON_9} ${INPUTDATA}/poupees.hdr + --compare-image ${EPSILON_9} ${INPUTDATA}/poupees.raw.hdr ${TEMP}/ioImageFileReaderRGB_BSQ2TIFF_poupees.tiff otbImageFileReaderRGBTest - ${INPUTDATA}/poupees.hdr + ${INPUTDATA}/poupees.raw.hdr ${TEMP}/ioImageFileReaderRGB_BSQ2TIFF_poupees.tiff ) otb_add_test(NAME ioTvImageReaderWriterRgbPNG2JPEG COMMAND otbImageIOTestDriver @@ -567,32 +567,32 @@ otb_add_test(NAME ioTvImageFileReaderTIF2PCI COMMAND otbImageIOTestDriver otb_add_test(NAME ioTvVectorImageComplexIntoRealDoubleTest COMMAND otbImageIOTestDriver otbVectorImageComplexIntoRealDoubleTest - ${INPUTDATA}/multibandComplexDouble_2bands.hdr + ${INPUTDATA}/multibandComplexDouble_2bands.raw.hdr ) otb_add_test(NAME ioTvVectorImageComplexDoubleTest COMMAND otbImageIOTestDriver otbVectorImageComplexDoubleTest - ${INPUTDATA}/multibandComplexDouble_2bands.hdr + ${INPUTDATA}/multibandComplexDouble_2bands.raw.hdr ) otb_add_test(NAME ioTvVectorImageComplexFloatTest COMMAND otbImageIOTestDriver otbVectorImageComplexFloatTest - ${INPUTDATA}/multibandComplexFloat_2bands.hdr + ${INPUTDATA}/multibandComplexFloat_2bands.raw.hdr ) otb_add_test(NAME ioTvVectorImageComplexIntoRealFloatTest COMMAND otbImageIOTestDriver otbVectorImageComplexIntoRealFloatTest - ${INPUTDATA}/multibandComplexFloat_2bands.hdr + ${INPUTDATA}/multibandComplexFloat_2bands.raw.hdr ) otb_add_test(NAME ioTvImageComplexFloatTest COMMAND otbImageIOTestDriver otbImageComplexFloatTest - ${INPUTDATA}/multibandComplexFloat_2bands.hdr + ${INPUTDATA}/multibandComplexFloat_2bands.raw.hdr ) otb_add_test(NAME ioTvImageComplexDoubleTest COMMAND otbImageIOTestDriver otbImageComplexDoubleTest - ${INPUTDATA}/multibandComplexDouble_2bands.hdr + ${INPUTDATA}/multibandComplexDouble_2bands.raw.hdr ) otb_add_test(NAME ioTvImageFileReaderShortLUM2LUM COMMAND otbImageIOTestDriver diff --git a/Modules/Registration/Stereo/test/CMakeLists.txt b/Modules/Registration/Stereo/test/CMakeLists.txt index 84d6ea0f84..36ae9a5922 100644 --- a/Modules/Registration/Stereo/test/CMakeLists.txt +++ b/Modules/Registration/Stereo/test/CMakeLists.txt @@ -250,15 +250,6 @@ otb_add_test(NAME dmTvMulti3DMapToDEMFilterStadiumMeanMultiThreadMultiStream COM 4 ) - - - - - - - - - otb_add_test(NAME dmTvAdhesionCorrectionFilter COMMAND otbStereoTestDriver --compare-n-images ${EPSILON_4} 3 ${BASELINE}/dmTuAdhesionCorrectionMethod_Corrected.tif @@ -272,8 +263,8 @@ otb_add_test(NAME dmTvAdhesionCorrectionFilter COMMAND otbStereoTestDriver ${INPUTDATA}/AdhesionCorrectionFilter_MedianMaskInput.png ${INPUTDATA}/AdhesionCorrectionFilter_SubpixelDisparityInput ${INPUTDATA}/AdhesionCorrectionFilter_SubpixelMaskInput.png - ${INPUTDATA}/AdhesionCorrectionFilter_CannyRefInput - ${INPUTDATA}/AdhesionCorrectionFilter_CannyMedianInput + ${INPUTDATA}/AdhesionCorrectionFilter_CannyRefInput.raw + ${INPUTDATA}/AdhesionCorrectionFilter_CannyMedianInput.raw 4 0.25 ${TEMP}/dmTuAdhesionCorrectionMethod_Corrected.tif ${TEMP}/dmTuAdhesionCorrectionMethod_CorrectedMask.png -- GitLab