diff --git a/Modules/Applications/AppImageUtils/test/CMakeLists.txt b/Modules/Applications/AppImageUtils/test/CMakeLists.txt index 1cd711226095ab0e136e3a5881536b497c3d41c5..187ad31a80de51fb145bb4dbb3e33b5c2f64181e 100644 --- a/Modules/Applications/AppImageUtils/test/CMakeLists.txt +++ b/Modules/Applications/AppImageUtils/test/CMakeLists.txt @@ -27,18 +27,19 @@ otb_test_application(NAME apTuUtDownloadSRTMTiles -tiledir ${INPUTDATA}/DEM/srtm_directory ) - - - -#----------- Convert TESTS ---------------- -otb_test_application(NAME apTvUtConvertBasic - APP Convert +#----------- DynamicConvert TESTS ------------ +otb_test_application(NAME apTvUtDynamicConvertBasic + APP DynamicConvert OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif - -out ${TEMP}/apTvUtConvertBasicOutput.tif float + -out ${TEMP}/apTvUtDynamicConvertOutput.tif + -type linear + -channels rgb + -channels.rgb.red 2 + -channels.rgb.green 3 + -channels.rgb.blue 1 VALID --compare-image ${NOTOL} - ${OTBAPP_BASELINE}/apTvUtConvertBasicOutput.tif - ${TEMP}/apTvUtConvertBasicOutput.tif -) + ${OTBAPP_BASELINE}/apTvUtConvertSelectChannelsRgbOutput.tif + ${TEMP}/apTvUtDynamicConvertOutput.tif) otb_test_application(NAME apTuUtDynamicConvertExtendedFilename_writer APP DynamicConvert @@ -46,16 +47,6 @@ otb_test_application(NAME apTuUtDynamicConvertExtendedFilename_writer -out ${TEMP}/apTvUtGeomExtendedFilename.tif?&gdal:co:TILED=YES&writegeom=false ) -otb_test_application(NAME apTvUtConvertWithScaling - APP Convert - OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif - -out ${TEMP}/apTvUtConvertWithScalingOutput.tif - -type linear - VALID --compare-image ${NOTOL} - ${OTBAPP_BASELINE}/apTvUtConvertWithScalingOutput.tif - ${TEMP}/apTvUtConvertWithScalingOutput.tif -) - otb_test_application(NAME apTvUtDynamicConvertExtendedFilename_readerGEOM APP DynamicConvert OPTIONS -in ${INPUTDATA}/ToulouseExtract_WithGeom.tif?&geom=${INPUTDATA}/ToulouseExtract_ModifiedGeom.geom @@ -64,43 +55,6 @@ otb_test_application(NAME apTvUtDynamicConvertExtendedFilename_readerGEOM ${INPUTDATA}/ToulouseExtract_ModifiedGeom.geom ${TEMP}/apTvUtGeomExtendedFilename.geom) -otb_test_application(NAME apTvUtConvertSelectChannels - APP Convert - OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif - -out ${TEMP}/apTvUtConvertSelectChannelsRgbOutput.tif - -channels rgb - -channels.rgb.red 2 - -channels.rgb.green 3 - -channels.rgb.blue 1 - -type linear - VALID --compare-image ${NOTOL} - ${OTBAPP_BASELINE}/apTvUtConvertSelectChannelsRgbOutput.tif - ${TEMP}/apTvUtConvertSelectChannelsRgbOutput.tif) - -otb_test_application(NAME apTvUtConvertMonoChannel - APP Convert - OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif - -out ${TEMP}/apTvUtConvertMonoChannelOutput.tif - -channels grayscale - -type linear - VALID --compare-image ${NOTOL} - ${OTBAPP_BASELINE}/apTvUtConvertMonoChannelOutput.tif - ${TEMP}/apTvUtConvertMonoChannelOutput.tif) - -#----------- DynamicConvert TESTS ------------ -otb_test_application(NAME apTvUtDynamicConvertBasic - APP DynamicConvert - OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif - -out ${TEMP}/apTvUtDynamicConvertOutput.tif - -type linear - -channels rgb - -channels.rgb.red 2 - -channels.rgb.green 3 - -channels.rgb.blue 1 - VALID --compare-image ${NOTOL} - ${OTBAPP_BASELINE}/apTvUtConvertSelectChannelsRgbOutput.tif - ${TEMP}/apTvUtDynamicConvertOutput.tif) - otb_test_application(NAME apTvUtDynamicConvertLog2 APP DynamicConvert OPTIONS -in ${INPUTDATA}/QB_Toulouse_Ortho_XS.tif