Commit fe6f6b1d authored by Manuel Grizonnet's avatar Manuel Grizonnet

ENH: Fix manually 25 new tests that are declared in other cxx tests files"

- New tests in Supervised module which where declared in *.cmake file and not CMakeLists.txt
- New test which where not named *New*
parent 465acf06
......@@ -33,11 +33,6 @@ target_link_libraries(otbSpatialObjectsTestDriver ${OTBSpatialObjects-Test_LIBRA
otb_module_target_label(otbSpatialObjectsTestDriver)
# Tests Declaration
otb_add_test(NAME coTuLineSpatialObjectListToPointSetFilter COMMAND otbSpatialObjectsTestDriver
otbLineSpatialObjectListToPointSetFilterNew)
otb_add_test(NAME bfTvSpatialObjectToImageDrawingFilterWithoutInputImage COMMAND otbSpatialObjectsTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvSpatialObjectDrawingNoInput.png
......@@ -62,4 +57,3 @@ otb_add_test(NAME coTuDrawLineSpatialObjectList COMMAND otbSpatialObjectsTestDri
otbDrawLineSpatialObjectList
${INPUTDATA}/ImageLineDir.bsq
${TEMP}/coFiltreDrawLineList_ImageLineDir.png )
......@@ -70,9 +70,6 @@ otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterSceneOutputInterestPointAscii
6 3 0.08 10.0
)
otb_add_test(NAME feTuHistogramOfOrientedGradientCovariantImageFunction COMMAND otbDescriptorsTestDriver
otbHistogramOfOrientedGradientCovariantImageFunctionNew)
otb_add_test(NAME feTvHistogramOfOrientedGradientCovariantImageFunction COMMAND otbDescriptorsTestDriver
--compare-ascii ${EPSILON_8}
${BASELINE_FILES}/feTvHistogramOfOrientedGradientCovariantImageFunction.txt
......@@ -241,7 +238,7 @@ otb_add_test(NAME feTvFourierMellinDescriptors COMMAND otbDescriptorsTestDriver
)
otb_add_test(NAME feTvImageToSIFTKeyPointSetFilterDistanceMap COMMAND otbDescriptorsTestDriver
--compare-ascii ${EPSILON_3}
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
${TEMP}/feTvImageToSIFTKeyPointSetFilterDistanceMap.txt
--ignore-lines-with 2 INFO DEBUG
......
......@@ -159,9 +159,6 @@ otb_add_test(NAME bfTvUnaryImageFunctorWithVectorImageFilter COMMAND otbImageMan
${TEMP}/bfTvUnaryImageFunctorWithVectorImageFilter.tif
)
otb_add_test(NAME coTuImageToVectorImageCastFilter COMMAND otbImageManipulationTestDriver
otbImageToVectorImageCastFilterNew)
otb_add_test(NAME bfTvPrintableImageFilterWithMask COMMAND otbImageManipulationTestDriver
--compare-image ${NOTOL}
${BASELINE}/bfTvPrintableImageFilterWithMask.png
......@@ -577,19 +574,19 @@ otb_add_test(NAME bfTvTwoNRIBandsImageToNComplexBandsImage COMMAND otbImageManip
${INPUTDATA}/RSAT_imagery_HH_HV_VV.tif
${TEMP}/bfTvTwoNRIBandsImageToNComplexBandsImage.tif
)
otb_add_test(NAME bfTvNRIBandImagesToOneNComplexBandsImage COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
${TEMP}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
otbNRIBandImagesToOneNComplexBandsImage
otbNRIBandImagesToOneNComplexBandsImage
${INPUTDATA}/RSAT_imagery_HH.tif
${INPUTDATA}/RSAT_imagery_HV.tif
${INPUTDATA}/RSAT_imagery_VV.tif
${TEMP}/bfTvNRIBandImagesToOneNComplexBandsImage.tif
)
otb_add_test(NAME bfTvOneRIBandImageToOneComplexBandImage COMMAND otbImageManipulationTestDriver
--compare-image ${EPSILON_3}
${INPUTDATA}/RSAT_imageryC_HH.tif
......
......@@ -93,9 +93,5 @@ otb_add_test(NAME bfTvBandMathImageFilterWithIdx COMMAND otbMathParserTestDriver
${TEMP}/bfTvBandMathImageFilterWithIdx2.tif
)
otb_add_test(NAME bfTuBandMathImageFilter COMMAND otbMathParserTestDriver
otbBandMathImageFilterNew)
otb_add_test(NAME bfTvBandMathImageFilter COMMAND otbMathParserTestDriver
otbBandMathImageFilter)
......@@ -58,9 +58,3 @@ otb_add_test(NAME hyTvVCAImageFilterTest1 COMMAND otbEndmembersExtractionTestDri
${INPUTDATA}/Hyperspectral/synthetic/hsi_cube.tif
${TEMP}/hyTvVCAImageFilterTest.tif
5 )
otb_add_test(NAME hyTuVCAImageFilterNew COMMAND otbEndmembersExtractionTestDriver
otbVCAImageFilterNew
${TEMP}/synthetic_vca_5.hdr
5 )
......@@ -129,9 +129,6 @@ otb_add_test(NAME ioTvGDALImageIOWriteMetadata COMMAND otbIOGDALTestDriver
${TEMP}/ioTvGDALImageIOWriteMetadata_Report.txt
)
otb_add_test(NAME ioTuGDALOverviewsBuilder COMMAND otbIOGDALTestDriver
otbGDALOverviewsBuilderNew)
otb_add_test(NAME ioTvGDALOverviewsBuilder_TIFF COMMAND otbIOGDALTestDriver
otbGDALOverviewsBuilder
${TEMP}/ioTvGDALImageIO_Tiff_NoOption.tif
......@@ -139,9 +136,6 @@ otb_add_test(NAME ioTvGDALOverviewsBuilder_TIFF COMMAND otbIOGDALTestDriver
)
set_property(TEST ioTvGDALOverviewsBuilder_TIFF PROPERTY DEPENDS ioTvGDALImageIO_Tiff_NoOption)
otb_add_test(NAME ioTuOGRVectorDataIO COMMAND otbIOGDALTestDriver
otbOGRVectorDataIONew )
otb_add_test(NAME ioTuGDALImageIOCanWrite_HFA COMMAND otbIOGDALTestDriver otbGDALImageIOTestCanWrite
${INPUTDATA}/HFAGeoreferenced.img)
......
......@@ -33,9 +33,6 @@ otb_module_target_label(otbIOKMLTestDriver)
# Tests Declaration
otb_add_test(NAME ioTuKMLVectorDataIO COMMAND otbIOKMLTestDriver
otbKMLVectorDataIONew )
otb_add_test(NAME ioTvKMLVectorDataIOFileReaderExample COMMAND otbIOKMLTestDriver
otbKMLVectorDataIOTestFileReader
${INPUTDATA}/MODIS20040214212340.kml
......@@ -58,4 +55,3 @@ otb_add_test(NAME ioTuKMLVectorDataIOCanWrite COMMAND otbIOKMLTestDriver
otb_add_test(NAME ioTuKMLVectorDataIOCanRead COMMAND otbIOKMLTestDriver
otbKMLVectorDataIOTestCanRead
${INPUTDATA}/MODIS20040214212340.kml)
......@@ -606,9 +606,6 @@ otb_add_test(NAME ioTvImageComplexDoubleTest COMMAND otbImageIOTestDriver
${INPUTDATA}/multibandComplexDouble_2bands.hdr
)
otb_add_test(NAME ioTuScalarBufferToImageFileWriter COMMAND otbImageIOTestDriver
otbScalarBufferToImageFileWriterNew )
otb_add_test(NAME ioTvImageFileReaderShortLUM2LUM COMMAND otbImageIOTestDriver
--compare-image ${EPSILON_9} ${INPUTDATA}/poupees_I2.lum
${TEMP}/ioImageFileReaderI2_LUM2LUM.lum
......
......@@ -23,9 +23,6 @@ otb_add_test(NAME leTvLibSVMMachineLearningModel COMMAND otbSupervisedTestDriver
${INPUTDATA}/letter_light.scale
${TEMP}/libsvm_model.txt
)
otb_add_test(NAME leTuLibSVMMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbLibSVMMachineLearningModelNew)
otb_add_test(NAME leTvImageClassificationFilterLibSVM COMMAND otbSupervisedTestDriver
--compare-image ${NOTOL}
${BASELINE}/leSVMImageClassificationFilterOutput.tif
......@@ -52,11 +49,3 @@ otb_add_test(NAME leTvLibSVMMachineLearningModelReg COMMAND otbSupervisedTestDri
#${INPUTDATA}/maur_labelled.tif
#${TEMP}/obTvLabelMapSVMClassifierLabeledOutput.tif)
otb_add_test(NAME obTuLabelMapSVMClassifierNew COMMAND otbSupervisedTestDriver
otbLabelMapClassifierNew)
otb_add_test(NAME leTuSVMCrossValidationCostFunctionNew COMMAND otbSupervisedTestDriver
otbSVMCrossValidationCostFunctionNew)
otb_add_test(NAME leTuSVMMarginSamplerNew COMMAND otbSupervisedTestDriver
otbSVMMarginSamplerNew)
......@@ -18,12 +18,6 @@
# limitations under the License.
#
otb_add_test(NAME leTuNormalBayesMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbNormalBayesMachineLearningModelNew)
otb_add_test(NAME leTuRandomForestsMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbRandomForestsMachineLearningModelNew)
otb_add_test(NAME leTvANNMachineLearningModel COMMAND otbSupervisedTestDriver
otbANNMachineLearningModel
${INPUTDATA}/letter_light.scale
......@@ -57,15 +51,6 @@ otb_add_test(NAME leTvRandomForestsMachineLearningModelReg COMMAND otbSupervised
)
# --------------------------------------------------------------
otb_add_test(NAME leTuSVMMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbSVMMachineLearningModelNew)
otb_add_test(NAME leTuDecisionTreeMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbDecisionTreeMachineLearningModelNew)
otb_add_test(NAME leTuKNearestNeighborsMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbKNearestNeighborsMachineLearningModelNew)
otb_add_test(NAME leTvSVMMachineLearningRegressionModel COMMAND otbSupervisedTestDriver
otbSVMMachineLearningRegressionModel
${INPUTDATA}/abalone.scale
......@@ -78,9 +63,6 @@ otb_add_test(NAME leTvSVMMachineLearningModel COMMAND otbSupervisedTestDriver
${TEMP}/svm_model.txt
)
otb_add_test(NAME leTuBoostMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbBoostMachineLearningModelNew)
otb_add_test(NAME leTvNormalBayesMachineLearningModel COMMAND otbSupervisedTestDriver
otbNormalBayesMachineLearningModel
${INPUTDATA}/letter_light.scale
......@@ -88,13 +70,11 @@ otb_add_test(NAME leTvNormalBayesMachineLearningModel COMMAND otbSupervisedTestD
)
if(NOT OTB_OPENCV_3)
otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModel COMMAND otbSupervisedTestDriver
otbGradientBoostedTreeMachineLearningModel
${INPUTDATA}/letter_light.scale
${TEMP}/gbt_model.txt
)
otb_add_test(NAME leTuGradientBoostedTreeMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbGradientBoostedTreeMachineLearningModelNew)
otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModel COMMAND otbSupervisedTestDriver
otbGradientBoostedTreeMachineLearningModel
${INPUTDATA}/letter_light.scale
${TEMP}/gbt_model.txt
)
endif()
otb_add_test(NAME leTvRandomForestsMachineLearningModel COMMAND otbSupervisedTestDriver
......@@ -103,9 +83,6 @@ otb_add_test(NAME leTvRandomForestsMachineLearningModel COMMAND otbSupervisedTes
${TEMP}/rf_model.txt
)
otb_add_test(NAME leTuANNMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbANNMachineLearningModelNew)
otb_add_test(NAME leTvKNearestNeighborsMachineLearningModel COMMAND otbSupervisedTestDriver
otbKNearestNeighborsMachineLearningModel
${INPUTDATA}/letter_light.scale
......@@ -124,9 +101,6 @@ otb_add_test(NAME leTvBoostMachineLearningModel COMMAND otbSupervisedTestDriver
${TEMP}/boost_model.txt
)
otb_add_test(NAME leTuImageClassificationFilterNew COMMAND otbSupervisedTestDriver
otbImageClassificationFilterNew)
otb_add_test(NAME leTvImageClassificationFilterSVM COMMAND otbSupervisedTestDriver
--compare-image ${NOTOL}
${BASELINE}/leImageClassificationFilterSVMOutput.tif
......@@ -144,11 +118,11 @@ otb_add_test(NAME leTvDecisionTreeMachineLearningModelCanRead COMMAND otbSupervi
set_property(TEST leTvDecisionTreeMachineLearningModelCanRead APPEND PROPERTY DEPENDS leTvDecisionTreeMachineLearningModel)
if(NOT OTB_OPENCV_3)
otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
otbGradientBoostedTreeMachineLearningModelCanRead
${TEMP}/gbt_model.txt
)
set_property(TEST leTvGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
otbGradientBoostedTreeMachineLearningModelCanRead
${TEMP}/gbt_model.txt
)
set_property(TEST leTvGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
endif()
otb_add_test(NAME leTvNormalBayesMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
......
......@@ -18,9 +18,6 @@
# limitations under the License.
#
otb_add_test(NAME leTuSharkRFMachineLearningModelNew COMMAND otbSupervisedTestDriver
otbSharkRFMachineLearningModelNew)
otb_add_test(NAME leTvSharkRFMachineLearningModel COMMAND otbSupervisedTestDriver
otbSharkRFMachineLearningModel
${INPUTDATA}/letter_light.scale
......
# kMeans Shark related tests
otb_add_test(NAME leTvSharkKMeansMachineLearningModelNew COMMAND otbUnsupervisedTestDriver
otbSharkKMeansMachineLearningModelNew
)
otb_add_test(NAME leTvSharkKMeansMachineLearningModel COMMAND otbUnsupervisedTestDriver
......
......@@ -81,10 +81,6 @@ otb_add_test(NAME owTvStringListParameter COMMAND otbApplicationEngineTestDriver
"my description"
)
otb_add_test(NAME owTvParameterRAM COMMAND otbApplicationEngineTestDriver
otbWrapperRAMParameterNew
)
otb_add_test(NAME owTvParameterKey COMMAND otbApplicationEngineTestDriver
otbWrapperParameterKey
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment