From dd6e1451d3496d324e144ca00e7ef011977d1366 Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@orfeo-toolbox.org> Date: Mon, 23 Mar 2009 11:14:06 +0100 Subject: [PATCH] TEST: Fixing failing tests and reducing tests time --- Testing/Code/Visualization/CMakeLists.txt | 6 +----- .../otbImageLayerRenderingModelSingleLayer.cxx | 8 ++++---- Testing/Code/Visualization/otbImageLayerScalar.cxx | 8 ++++---- Testing/Code/Visualization/otbImageLayerVector.cxx | 8 ++++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Testing/Code/Visualization/CMakeLists.txt b/Testing/Code/Visualization/CMakeLists.txt index 0107c93024..7d341484f2 100644 --- a/Testing/Code/Visualization/CMakeLists.txt +++ b/Testing/Code/Visualization/CMakeLists.txt @@ -57,10 +57,6 @@ ADD_TEST(vrTuImageLayerNew ${VISUREFAC_TESTS1} otbImageLayerNew ) -ADD_TEST(vrTvImageLayer ${VISUREFAC_TESTS1} -otbImageLayer -) - ADD_TEST(vrTvImageLayerScalar ${VISUREFAC_TESTS1} --compare-n-images ${TOL} 3 ${BASELINE}/vrTvImageLayerScalarQuicklookOutput.png @@ -90,7 +86,7 @@ ${INPUTDATA}/couleurs.tif ${TEMP}/vrTvImageLayerVectorQuicklookOutput.png ${TEMP}/vrTvImageLayerVectorExtractOutput.png ${TEMP}/vrTvImageLayerVectorScaledExtractOutput.png -2 50 50 50 200 200 200 +10 50 50 50 200 200 200 ) #------------ otb::StandardRenderingFunction ------------ diff --git a/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx b/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx index 293bf834da..a5b3fa91c6 100644 --- a/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx +++ b/Testing/Code/Visualization/otbImageLayerRenderingModelSingleLayer.cxx @@ -62,8 +62,8 @@ int otbImageLayerRenderingModelSingleLayer( int argc, char * argv[] ) ImageType::RegionType::IndexType index; ImageType::RegionType::SizeType size; - size[0]=lregion.GetSize()[0]/2; - size[1]=lregion.GetSize()[1]/2; + size[0]=100; + size[1]=100; index[0] = lregion.GetSize()[0]/4; index[1] = lregion.GetSize()[1]/4; @@ -72,8 +72,8 @@ int otbImageLayerRenderingModelSingleLayer( int argc, char * argv[] ) extractRegion.SetSize(size); extractRegion.SetIndex(index); - size[0]=lregion.GetSize()[0]/4; - size[1]=lregion.GetSize()[1]/4; + size[0]=25; + size[1]=25; index[0] = 3 * lregion.GetSize()[0]/8; index[1] = 3 * lregion.GetSize()[1]/8; diff --git a/Testing/Code/Visualization/otbImageLayerScalar.cxx b/Testing/Code/Visualization/otbImageLayerScalar.cxx index 0b40a833bc..b7274a8967 100644 --- a/Testing/Code/Visualization/otbImageLayerScalar.cxx +++ b/Testing/Code/Visualization/otbImageLayerScalar.cxx @@ -76,8 +76,8 @@ int otbImageLayerScalar( int argc, char * argv[] ) ImageType::RegionType::IndexType index; ImageType::RegionType::SizeType size; - size[0]=lregion.GetSize()[0]/2; - size[1]=lregion.GetSize()[1]/2; + size[0]=100; + size[1]=100; index[0] = lregion.GetSize()[0]/4; index[1] = lregion.GetSize()[1]/4; @@ -88,8 +88,8 @@ int otbImageLayerScalar( int argc, char * argv[] ) layer->SetExtractRegion(extractRegion); - size[0]=lregion.GetSize()[0]/4; - size[1]=lregion.GetSize()[1]/4; + size[0]=25; + size[1]=25; index[0] = 3 * lregion.GetSize()[0]/8; index[1] = 3 * lregion.GetSize()[1]/8; diff --git a/Testing/Code/Visualization/otbImageLayerVector.cxx b/Testing/Code/Visualization/otbImageLayerVector.cxx index dd906904b7..2950dfbfc9 100644 --- a/Testing/Code/Visualization/otbImageLayerVector.cxx +++ b/Testing/Code/Visualization/otbImageLayerVector.cxx @@ -88,8 +88,8 @@ int otbImageLayerVector( int argc, char * argv[] ) ImageType::RegionType::IndexType index; ImageType::RegionType::SizeType size; - size[0]=lregion.GetSize()[0]/2; - size[1]=lregion.GetSize()[1]/2; + size[0]=100; + size[1]=100; index[0] = lregion.GetSize()[0]/4; index[1] = lregion.GetSize()[1]/4; @@ -100,8 +100,8 @@ int otbImageLayerVector( int argc, char * argv[] ) layer->SetExtractRegion(extractRegion); - size[0]=lregion.GetSize()[0]/4; - size[1]=lregion.GetSize()[1]/4; + size[0]=25; + size[1]=25; index[0] = 3 * lregion.GetSize()[0]/8; index[1] = 3 * lregion.GetSize()[1]/8; -- GitLab