From 51d5b0675b82ffc7fe7b97537df8922537fc030d Mon Sep 17 00:00:00 2001 From: Thomas Feuvrier <thomas.feuvrier@c-s.fr> Date: Tue, 11 Dec 2007 17:15:17 +0000 Subject: [PATCH] Mise a jour Thomas pour testing --- Examples/Tutorials/CMakeLists.txt | 35 +++++++++++++++++++ Examples/Tutorials/FilteringPipeline.cxx | 8 ++++- Examples/Tutorials/Pipeline.cxx | 8 ++++- Examples/Tutorials/ScalingPipeline.cxx | 8 ++++- Examples/Tutorials/SimpleViewer.cxx | 2 +- .../Tutorials/SmarterFilteringPipeline.cxx | 9 ++++- .../Tutorials/otbTutorialsExamplesTests.cxx | 23 +++++++++++- 7 files changed, 87 insertions(+), 6 deletions(-) diff --git a/Examples/Tutorials/CMakeLists.txt b/Examples/Tutorials/CMakeLists.txt index b05f7a8796..b376d8e1a3 100644 --- a/Examples/Tutorials/CMakeLists.txt +++ b/Examples/Tutorials/CMakeLists.txt @@ -36,6 +36,41 @@ SET(EXE_TESTS ${CXX_TEST_PATH}/otbTutorialsExamplesTests) SET(TOL 0.0) +ADD_TEST( TutorialsPipelineTest ${EXE_TESTS} + --compare-image ${TOL} ${BASELINE}/TutorialsPipelineOutput.png + ${TEMP}/TutorialsPipelineOutput.png + TutorialsPipelineTest + ${INPUTDATA}/QB_Suburb.png + ${TEMP}/TutorialsPipelineOutput.png + ) +ADD_TEST( TutorialsFilteringPipelineTest ${EXE_TESTS} + --compare-image ${TOL} ${BASELINE}/TutorialsFilteringPipelineOutput.png + ${TEMP}/TutorialsFilteringPipelineOutput.png + TutorialsFilteringPipelineTest + ${INPUTDATA}/QB_Suburb.png + ${TEMP}/TutorialsFilteringPipelineOutput.png + ) +ADD_TEST( TutorialsScalingPipelineTest ${EXE_TESTS} + --compare-image ${TOL} ${BASELINE}/TutorialsScalingPipelineOutput.png + ${TEMP}/TutorialsScalingPipelineOutput.png + TutorialsScalingPipelineTest + ${INPUTDATA}/QB_Suburb.png + ${TEMP}/TutorialsScalingPipelineOutput.png + ) + +ADD_TEST( TutorialsSmarterFilteringPipelineTest ${EXE_TESTS} + --compare-image ${TOL} ${BASELINE}/TutorialsSmarterFilteringPipelineOutput.png + ${TEMP}/TutorialsSmarterFilteringPipelineOutput.png + TutorialsSmarterFilteringPipelineTest + -in ${INPUTDATA}/QB_Suburb.png + -out ${TEMP}/TutorialsSmarterFilteringPipelineOutput.png + -d 1.5 + -i 2 + -a 0.1 + ) + + + INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}") diff --git a/Examples/Tutorials/FilteringPipeline.cxx b/Examples/Tutorials/FilteringPipeline.cxx index ae1d0ae28b..e23e3d5e0b 100644 --- a/Examples/Tutorials/FilteringPipeline.cxx +++ b/Examples/Tutorials/FilteringPipeline.cxx @@ -16,6 +16,12 @@ =========================================================================*/ +// Software Guide : BeginCommandLineArgs +// INPUTS: {QB_Suburb.png} +// OUTPUTS: {TutorialsFilteringPipelineOutput.png} +// Software Guide : EndCommandLineArgs + + // Software Guide : BeginLatex // // @@ -34,7 +40,7 @@ #include "otbStreamingImageFileWriter.h" #include "itkGradientMagnitudeImageFilter.h" -int main(int argc, char ** argv) +int main( int argc, char * argv[] ) { // Software Guide : EndCodeSnippet diff --git a/Examples/Tutorials/Pipeline.cxx b/Examples/Tutorials/Pipeline.cxx index 0bd32241d8..8b68604dc0 100644 --- a/Examples/Tutorials/Pipeline.cxx +++ b/Examples/Tutorials/Pipeline.cxx @@ -16,6 +16,12 @@ =========================================================================*/ +// Software Guide : BeginCommandLineArgs +// INPUTS: {QB_Suburb.png} +// OUTPUTS: {TutorialsPipelineOutput.png} +// Software Guide : EndCommandLineArgs + + // Software Guide : BeginLatex // // Start by including some necessary headers and with the @@ -28,7 +34,7 @@ #include "otbImageFileReader.h" #include "otbStreamingImageFileWriter.h" -int main(int argc, char ** argv) +int main( int argc, char * argv[] ) { // Software Guide : EndCodeSnippet diff --git a/Examples/Tutorials/ScalingPipeline.cxx b/Examples/Tutorials/ScalingPipeline.cxx index ea461ce7ba..43666d1c1d 100644 --- a/Examples/Tutorials/ScalingPipeline.cxx +++ b/Examples/Tutorials/ScalingPipeline.cxx @@ -16,6 +16,12 @@ =========================================================================*/ +// Software Guide : BeginCommandLineArgs +// INPUTS: {QB_Suburb.png} +// OUTPUTS: {TutorialsScalingPipelineOutput.png} +// Software Guide : EndCommandLineArgs + + // Software Guide : BeginLatex // // This example illustrates the use of the @@ -35,7 +41,7 @@ #include "itkCannyEdgeDetectionImageFilter.h" #include "itkRescaleIntensityImageFilter.h" -int main(int argc, char ** argv) +int main( int argc, char * argv[] ) { // Software Guide : EndCodeSnippet diff --git a/Examples/Tutorials/SimpleViewer.cxx b/Examples/Tutorials/SimpleViewer.cxx index 14eef574e5..beb36e2abe 100644 --- a/Examples/Tutorials/SimpleViewer.cxx +++ b/Examples/Tutorials/SimpleViewer.cxx @@ -33,7 +33,7 @@ #include "itkGradientMagnitudeImageFilter.h" #include "otbImageViewer.h" -int main(int argc, char ** argv) +int main( int argc, char * argv[] ) { // Software Guide : EndCodeSnippet diff --git a/Examples/Tutorials/SmarterFilteringPipeline.cxx b/Examples/Tutorials/SmarterFilteringPipeline.cxx index ff570e1749..ef7a03bf38 100644 --- a/Examples/Tutorials/SmarterFilteringPipeline.cxx +++ b/Examples/Tutorials/SmarterFilteringPipeline.cxx @@ -16,6 +16,13 @@ =========================================================================*/ +// Software Guide : BeginCommandLineArgs +// INPUTS: {QB_Suburb.png} +// OUTPUTS: {TutorialsSmarterFilteringPipelineOutput.png} +// -d 1.5 -i 2 -a 0.1 +// Software Guide : EndCommandLineArgs + + // Software Guide : BeginLatex // // @@ -71,7 +78,7 @@ #include "itkRescaleIntensityImageFilter.h" #include "otbHarrisImageFilter.h" -int main(int argc, char ** argv) +int main( int argc, char * argv[] ) { // Software Guide : EndCodeSnippet diff --git a/Examples/Tutorials/otbTutorialsExamplesTests.cxx b/Examples/Tutorials/otbTutorialsExamplesTests.cxx index a81128ac7a..95cf375927 100644 --- a/Examples/Tutorials/otbTutorialsExamplesTests.cxx +++ b/Examples/Tutorials/otbTutorialsExamplesTests.cxx @@ -26,8 +26,29 @@ void RegisterTests() { REGISTER_TEST(HelloWorldOTBTest); + REGISTER_TEST(TutorialsPipelineTest); + REGISTER_TEST(TutorialsFilteringPipelineTest); + REGISTER_TEST(TutorialsScalingPipelineTest); + REGISTER_TEST(TutorialsSmarterFilteringPipelineTest); } #undef main #define main HelloWorldOTBTest -#include "HelloWorldOTBTest.cxx" +#include "HelloWorldOTBT.cxx" + +#undef main +#define main TutorialsPipelineTest +#include "Pipeline.cxx" + +#undef main +#define main TutorialsFilteringPipelineTest +#include "FilteringPipeline.cxx" + +#undef main +#define main TutorialsScalingPipelineTest +#include "ScalingPipeline.cxx" + +#undef main +#define main TutorialsSmarterFilteringPipelineTest +#include "SmarterFilteringPipeline.cxx" + -- GitLab