From 71463322b9634f75c45fafb9ea2c14a13973bfa9 Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@orfeo-toolbox.org> Date: Thu, 19 Feb 2015 11:39:04 +0100 Subject: [PATCH] TEST: Moving misplaced test --- .../Adapters/OSSIMAdapters/otb-module.cmake | 1 - .../Adapters/OSSIMAdapters/test/CMakeLists.txt | 18 ------------------ .../Radiometry/Simulation/test/CMakeLists.txt | 18 ++++++++++++++++++ .../test/otbFilterFunctionValues.cxx | 0 4 files changed, 18 insertions(+), 19 deletions(-) rename Modules/{Adapters/OSSIMAdapters => Radiometry/Simulation}/test/otbFilterFunctionValues.cxx (100%) diff --git a/Modules/Adapters/OSSIMAdapters/otb-module.cmake b/Modules/Adapters/OSSIMAdapters/otb-module.cmake index 12b84638a5..c4ea6a6f1f 100644 --- a/Modules/Adapters/OSSIMAdapters/otb-module.cmake +++ b/Modules/Adapters/OSSIMAdapters/otb-module.cmake @@ -13,7 +13,6 @@ otb_module(OTBOSSIMAdapters TEST_DEPENDS OTBTestKernel OTBProjection - OTBSimulation DESCRIPTION "${DOCUMENTATION}" diff --git a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt index ecf1ca9d89..c5d4630f2d 100644 --- a/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt +++ b/Modules/Adapters/OSSIMAdapters/test/CMakeLists.txt @@ -267,24 +267,6 @@ otb_add_test(NAME prTvossimElevManagerTest2 COMMAND otbOSSIMAdaptersTestDriver 500 ) -otb_add_test(NAME raTvFilterFunctionValuesSpectralResponseTest COMMAND otbOSSIMAdaptersTestDriver - --compare-ascii ${EPSILON_6} ${BASELINE_FILES}/raTvFilterFunctionValuesSpectralResponseTest.txt - ${TEMP}/raTvFilterFunctionValuesSpectralResponseTest.txt - otbFilterFunctionValuesSpectralResponseTest - ${SPECTRUM_DB}/JHU/becknic/manmade/txt/0092uuu.txt - ${TEMP}/raTvFilterFunctionValuesSpectralResponseTest.txt - 0.0025 - ) - -otb_add_test(NAME raTuFilterFunctionValuesTest COMMAND otbOSSIMAdaptersTestDriver - otbFilterFunctionValuesTest - ${TEMP}/raTuFilterFunctionValuesTest.txt - 0.5 # lambda min - 0.7 # lambda max - 0.05 # user step - 0.2 0.5 0.3 0.9 0.8 # vector - ) - otb_add_test(NAME prTvossimElevManagerTest4 COMMAND otbOSSIMAdaptersTestDriver --compare-image ${EPSILON_9} ${BASELINE}/prTvossimElevManagerTest4 ${TEMP}/prTvossimElevManagerTest4.hdr diff --git a/Modules/Radiometry/Simulation/test/CMakeLists.txt b/Modules/Radiometry/Simulation/test/CMakeLists.txt index d61b53c51a..05e7336abd 100644 --- a/Modules/Radiometry/Simulation/test/CMakeLists.txt +++ b/Modules/Radiometry/Simulation/test/CMakeLists.txt @@ -24,6 +24,7 @@ otbImageSimulationMethodWithVectorDataTest.cxx otbSailReflVTest.cxx otbSatelliteRSRNew.cxx otbSailReflHTest.cxx +otbFilterFunctionValues.cxx ) add_executable(otbSimulationTestDriver ${OTBSimulationTests}) @@ -272,3 +273,20 @@ otb_add_test(NAME siTvSailReflHTest COMMAND otbSimulationTestDriver ${TEMP}/siTvSailReflHTest.txt ) +otb_add_test(NAME raTvFilterFunctionValuesSpectralResponseTest COMMAND otbSimulationTestDriver + --compare-ascii ${EPSILON_6} ${BASELINE_FILES}/raTvFilterFunctionValuesSpectralResponseTest.txt + ${TEMP}/raTvFilterFunctionValuesSpectralResponseTest.txt + otbFilterFunctionValuesSpectralResponseTest + ${SPECTRUM_DB}/JHU/becknic/manmade/txt/0092uuu.txt + ${TEMP}/raTvFilterFunctionValuesSpectralResponseTest.txt + 0.0025 + ) + +otb_add_test(NAME raTuFilterFunctionValuesTest COMMAND otbSimulationTestDriver + otbFilterFunctionValuesTest + ${TEMP}/raTuFilterFunctionValuesTest.txt + 0.5 # lambda min + 0.7 # lambda max + 0.05 # user step + 0.2 0.5 0.3 0.9 0.8 # vector + ) diff --git a/Modules/Adapters/OSSIMAdapters/test/otbFilterFunctionValues.cxx b/Modules/Radiometry/Simulation/test/otbFilterFunctionValues.cxx similarity index 100% rename from Modules/Adapters/OSSIMAdapters/test/otbFilterFunctionValues.cxx rename to Modules/Radiometry/Simulation/test/otbFilterFunctionValues.cxx -- GitLab