From 10b46cf466c7e7a3fa46dc7b72688463a842b47e Mon Sep 17 00:00:00 2001
From: Stephane ALBERT <stephane.albert@c-s.fr>
Date: Thu, 21 Feb 2019 16:09:36 +0100
Subject: [PATCH] ENH: 1834: Fixed broken tests due to filerename .hdr into
.raw.hdr.
---
.../AppImageUtils/test/CMakeLists.txt | 4 ++--
Modules/Core/ObjectList/test/CMakeLists.txt | 18 +++++++++---------
.../Filtering/Statistics/test/CMakeLists.txt | 2 +-
Modules/IO/IOBSQ/test/CMakeLists.txt | 1 -
Modules/IO/ImageIO/test/CMakeLists.txt | 2 +-
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Modules/Applications/AppImageUtils/test/CMakeLists.txt b/Modules/Applications/AppImageUtils/test/CMakeLists.txt
index 186d4ac477..8dfabd790e 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/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/Filtering/Statistics/test/CMakeLists.txt b/Modules/Filtering/Statistics/test/CMakeLists.txt
index 66c7bc0c66..df73b17125 100644
--- a/Modules/Filtering/Statistics/test/CMakeLists.txt
+++ b/Modules/Filtering/Statistics/test/CMakeLists.txt
@@ -235,7 +235,7 @@ otb_add_test(NAME bfTvStreamingStatisticsImageFilter COMMAND otbStatisticsTestDr
otbStreamingStatisticsImageFilter
${INPUTDATA}/small_poupees_1canal.hd
${TEMP}/bfStreamingStatisticsImageFilterResults.txt)
-
+
foreach(inputFileType "UINT8" "UINT16" "INT16" "UINT32" "INT32" "FLOAT" "DOUBLE")
foreach(sizeType "LARGE" "SMALL")
string(TOLOWER ${sizeType} lsizeType)
diff --git a/Modules/IO/IOBSQ/test/CMakeLists.txt b/Modules/IO/IOBSQ/test/CMakeLists.txt
index 0b5b7bf7a4..9b128826e6 100644
--- a/Modules/IO/IOBSQ/test/CMakeLists.txt
+++ b/Modules/IO/IOBSQ/test/CMakeLists.txt
@@ -37,4 +37,3 @@ otb_add_test(NAME ioTuBSQImageIOCanRead COMMAND otbIOBSQTestDriver otbBSQImageIO
otb_add_test(NAME ioTuBSQImageIOCanWrite COMMAND otbIOBSQTestDriver otbBSQImageIOTestCanWrite
${TEMP}/poupees.hd)
-
diff --git a/Modules/IO/ImageIO/test/CMakeLists.txt b/Modules/IO/ImageIO/test/CMakeLists.txt
index c31024f53f..d8abd605c3 100644
--- a/Modules/IO/ImageIO/test/CMakeLists.txt
+++ b/Modules/IO/ImageIO/test/CMakeLists.txt
@@ -124,7 +124,7 @@ otb_add_test(NAME ioTvImageFileReaderShortRGB_BSQ2HDR COMMAND otbImageIOTestDriv
otb_add_test(NAME ioTvImageFileReaderShortHDR2BSQ COMMAND otbImageIOTestDriver
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees_I2.hd
- ${TEMP}/ioImageFileReaderI2_HDR2BSQ.raw.hd
+ ${TEMP}/ioImageFileReaderI2_HDR2BSQ.hd
otbShortRGBImageIOTest
${TEMP}/ioImageFileReaderI2_BSQ2HDR.hdr
${TEMP}/ioImageFileReaderI2_HDR2BSQ.hd )
--
GitLab