From 924c4376c9d017bf53f238ef57879c0670f20596 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Fri, 19 Apr 2019 13:16:12 +0000
Subject: [PATCH] TEST: Fix tests depending on removed files rcc8_mire*
---
.../OTB/Images/feImageToEdgePathFilterOutput.tif | 3 +++
Examples/OBIA/LabelMapToVectorData.cxx | 2 +-
Examples/OBIA/test/CMakeLists.txt | 4 ++--
Modules/Core/LabelMap/test/CMakeLists.txt | 8 ++++----
...LabelMapWithClassLabelToLabeledSampleListFilter.cxx | 2 +-
Modules/Filtering/Path/test/CMakeLists.txt | 10 +++++-----
Modules/Segmentation/Conversion/test/CMakeLists.txt | 10 +---------
7 files changed, 17 insertions(+), 22 deletions(-)
create mode 100644 Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif
diff --git a/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif b/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif
new file mode 100644
index 0000000000..fb2de39373
--- /dev/null
+++ b/Data/Baseline/OTB/Images/feImageToEdgePathFilterOutput.tif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c006246fea917e0870d9fcbac03c8ee7f80e65d3faffd1e76b731192dbef5978
+size 546
diff --git a/Examples/OBIA/LabelMapToVectorData.cxx b/Examples/OBIA/LabelMapToVectorData.cxx
index 001d38ecf9..2f2a142340 100644
--- a/Examples/OBIA/LabelMapToVectorData.cxx
+++ b/Examples/OBIA/LabelMapToVectorData.cxx
@@ -20,7 +20,7 @@
/* Example usage:
-./LabelMapToVectorData Input/rcc8_mire1.png Output/rcc8_mire2_vectorizer.shp
+./LabelMapToVectorData Input/labelImage_UnsignedChar.tif Output/LabelMapToVectorData.shp
*/
diff --git a/Examples/OBIA/test/CMakeLists.txt b/Examples/OBIA/test/CMakeLists.txt
index 49cb2f872e..563fdaf618 100644
--- a/Examples/OBIA/test/CMakeLists.txt
+++ b/Examples/OBIA/test/CMakeLists.txt
@@ -42,6 +42,6 @@ set(INPUTDATA ${OTB_DATA_ROOT}/Input)
otb_add_test(NAME trTeLabelMapToVectorData COMMAND ${OTB_TEST_DRIVER}
Execute $<TARGET_FILE:LabelMapToVectorData>
- ${INPUTDATA}/rcc8_mire1.png
- ${TEMP}/rcc8_mire2_vectorizer.shp
+ ${INPUTDATA}/labelImage_UnsignedChar.tif
+ ${TEMP}/trTeLabelMapToVectorDataOutput.shp
)
diff --git a/Modules/Core/LabelMap/test/CMakeLists.txt b/Modules/Core/LabelMap/test/CMakeLists.txt
index 068325e08e..be4639ecdd 100644
--- a/Modules/Core/LabelMap/test/CMakeLists.txt
+++ b/Modules/Core/LabelMap/test/CMakeLists.txt
@@ -41,8 +41,8 @@ otb_module_target_label(otbLabelMapTestDriver)
otb_add_test(NAME obTvLabelObjectMapVectorizer COMMAND otbLabelMapTestDriver
otbLabelObjectMapVectorizer
- ${INPUTDATA}/rcc8_mire1.png
- rcc8_mire1_label_vectorizer.gml)
+ ${INPUTDATA}/labelImage_UnsignedChar.tif
+ otbLabelObjectMapVectorizerOutput.gml)
otb_add_test(NAME obTvLabelImageToLabelMapWithAdjacencyFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
@@ -64,13 +64,13 @@ otb_add_test(NAME obTvKMeansAttributesLabelMapFilter COMMAND otbLabelMapTestDriv
${TEMP}/obTvKMeansAttributesLabelMapFilter.txt)
otb_add_test(NAME obTvLabelMapToSampleListFilter COMMAND otbLabelMapTestDriver
otbLabelMapToSampleListFilter
- ${OTB_DATA_ROOT}/Input/rcc8_mire1.png
+ ${OTB_DATA_ROOT}/Input/labelImage_UnsignedChar.tif
SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04
SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08
SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11)
otb_add_test(NAME obTvLabelMapWithClassLabelToLabeledSampleListFilter COMMAND otbLabelMapTestDriver
otbLabelMapWithClassLabelToLabeledSampleListFilter
- ${OTB_DATA_ROOT}/Input/rcc8_mire1.png
+ ${OTB_DATA_ROOT}/Input/labelImage_UnsignedChar.tif
SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04
SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08
SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11)
diff --git a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
index 695a24f06d..31d6b9a066 100644
--- a/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
+++ b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
@@ -62,7 +62,7 @@ int otbLabelMapWithClassLabelToLabeledSampleListFilter(int argc, char* argv[])
LabelMapFilterType::Pointer labelMapFilter = LabelMapFilterType::New();
labelMapFilter->SetInput(lreader->GetOutput());
- labelMapFilter->SetInputForegroundValue(255);
+ labelMapFilter->SetInputForegroundValue(1);
ShapeLabelMapFilterType::Pointer shapeLabelMapFilter = ShapeLabelMapFilterType::New();
shapeLabelMapFilter->SetInput(labelMapFilter->GetOutput());
diff --git a/Modules/Filtering/Path/test/CMakeLists.txt b/Modules/Filtering/Path/test/CMakeLists.txt
index 699c24a3ca..c8b832d8d9 100644
--- a/Modules/Filtering/Path/test/CMakeLists.txt
+++ b/Modules/Filtering/Path/test/CMakeLists.txt
@@ -62,12 +62,12 @@ otb_add_test(NAME feTvImageToEdgePathFilterBis COMMAND otbPathTestDriver
otb_add_test(NAME feTvImageToEdgePathFilter COMMAND otbPathTestDriver
--compare-image ${EPSILON_8}
- ${BASELINE}/feImageToEdgePathFilter_rcc8_mire4.png
- ${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png
+ ${BASELINE}/feImageToEdgePathFilterOutput.tif
+ ${TEMP}/feImageToEdgePathFilterOutput.tif
otbImageToEdgePathFilter
- ${INPUTDATA}/rcc8_mire4.png
- ${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png
- 255
+ ${INPUTDATA}/labelImage_UnsignedChar.tif
+ ${TEMP}/feImageToEdgePathFilterOutput.tif
+ 3
)
otb_add_test(NAME feTuCompacityPathCircle COMMAND otbPathTestDriver
diff --git a/Modules/Segmentation/Conversion/test/CMakeLists.txt b/Modules/Segmentation/Conversion/test/CMakeLists.txt
index 363687e5c3..b704bd6275 100644
--- a/Modules/Segmentation/Conversion/test/CMakeLists.txt
+++ b/Modules/Segmentation/Conversion/test/CMakeLists.txt
@@ -195,19 +195,11 @@ otb_add_test(NAME bfTvVectorDataRasterizeFilterSHP COMMAND otbConversionTestDriv
#4 25 0.1 100
#)
-otb_add_test(NAME obTvLabelMapToVectorDataFilter2 COMMAND otbConversionTestDriver
- --compare-ogr ${NOTOL}
- ${BASELINE_FILES}/obTvLabelMapToVectorDataFilter.shp
- ${TEMP}/obTvLabelMapToVectorDataFilter2.shp
- otbLabelMapToVectorDataFilter
- ${INPUTDATA}/rcc8_mire5.png
- ${TEMP}/obTvLabelMapToVectorDataFilter2.shp)
-
otb_add_test(NAME obTvLabelMapToVectorDataFilter COMMAND otbConversionTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/obTvLabelMapToVectorDataFilter.shp
${TEMP}/obTvLabelMapToVectorDataFilter.shp
otbLabelMapToVectorDataFilter
- ${INPUTDATA}/rcc8_mire1.png
+ ${INPUTDATA}/labelImage_UnsignedChar.tif
${TEMP}/obTvLabelMapToVectorDataFilter.shp)
--
GitLab