From 1033629f2d170cdcb74b216f71623e47e4e6f707 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Fri, 22 Jun 2012 16:36:50 +0200
Subject: [PATCH] TEST: Adapting tests accordingly
---
Testing/Code/Segmentation/CMakeLists.txt | 8 ++++----
.../Segmentation/otbOGRLayerStreamStitchingFilter.cxx | 9 ++++-----
Testing/Code/Segmentation/otbSegmentationTests1.cxx | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Testing/Code/Segmentation/CMakeLists.txt b/Testing/Code/Segmentation/CMakeLists.txt
index 1e65925769..bb463bf5e5 100644
--- a/Testing/Code/Segmentation/CMakeLists.txt
+++ b/Testing/Code/Segmentation/CMakeLists.txt
@@ -112,12 +112,12 @@ ADD_TEST(obTvStreamingImageToOGRLayerSegmentationFilterHalfSpacing ${SEGMENTATIO
-# ------- otb::OGRDataSourceStreamStitchingFilter -------------
-ADD_TEST(obTuOGRDataSourceStreamStitchingFilter ${SEGMENTATION_TESTS1}
+# ------- otb::OGRLayerStreamStitchingFilter -------------
+ADD_TEST(obTuOGRLayerStreamStitchingFilter ${SEGMENTATION_TESTS1}
--compare-ogr ${EPSILON_8}
${BASELINE_FILES}/obTvFusionOGRTile.shp
${TEMP}/obTvFusionOGRTile.shp
- otbOGRDataSourceStreamStitchingFilter
+ otbOGRLayerStreamStitchingFilter
${INPUTDATA}/QB_Toulouse_Ortho_PAN.tif
${INPUTDATA}/QB_Toulouse_Ortho_withTiles.shp
${TEMP}/obTvFusionOGRTile.shp
@@ -134,7 +134,7 @@ otbHooverInstanceFilterToAttributeImage.cxx
otbWatershedSegmentationFilter.cxx
otbMeanShiftSegmentationFilter.cxx
otbStreamingImageToOGRLayerSegmentationFilter.cxx
-otbOGRDataSourceStreamStitchingFilter.cxx
+otbOGRLayerStreamStitchingFilter.cxx
)
ADD_EXECUTABLE(otbSegmentationTests1 otbSegmentationTests1.cxx ${Segmentation_SRCS1})
diff --git a/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx b/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
index 7e88dfdbc9..b52febb0a8 100644
--- a/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
+++ b/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
@@ -16,13 +16,13 @@
=========================================================================*/
-#include "otbOGRDataSourceStreamStitchingFilter.h"
+#include "otbOGRLayerStreamStitchingFilter.h"
#include "otbImage.h"
#include "otbImageFileReader.h"
#include "itksys/SystemTools.hxx"
#include "otbOGRDataSourceWrapper.h"
-int otbOGRDataSourceStreamStitchingFilter(int argc, char * argv[])
+int otbOGRLayerStreamStitchingFilter(int argc, char * argv[])
{
if (argc != 6)
{
@@ -42,7 +42,7 @@ int otbOGRDataSourceStreamStitchingFilter(int argc, char * argv[])
typedef float PixelType;
typedef otb::Image<PixelType, Dimension> ImageType;
- typedef otb::OGRDataSourceStreamStitchingFilter<ImageType> FilterType;
+ typedef otb::OGRLayerStreamStitchingFilter<ImageType> FilterType;
typedef otb::ImageFileReader<ImageType> ReaderType;
ReaderType::Pointer reader = ReaderType::New();
@@ -79,9 +79,8 @@ int otbOGRDataSourceStreamStitchingFilter(int argc, char * argv[])
otb::ogr::DataSource::Pointer ogrDS = otb::ogr::DataSource::New(tmpOGRfname, otb::ogr::DataSource::Modes::append);
filter->SetInput(reader->GetOutput());
- filter->SetOGRDataSource(ogrDS);
+ filter->SetOGRLayer(ogrDS->GetLayer(layerName));
filter->SetStreamSize(streamSize);
- filter->SetLayerName(layerName);
filter->GenerateData();
return EXIT_SUCCESS;
diff --git a/Testing/Code/Segmentation/otbSegmentationTests1.cxx b/Testing/Code/Segmentation/otbSegmentationTests1.cxx
index f730e3d0b4..8add4c3995 100644
--- a/Testing/Code/Segmentation/otbSegmentationTests1.cxx
+++ b/Testing/Code/Segmentation/otbSegmentationTests1.cxx
@@ -27,7 +27,7 @@ void RegisterTests()
{
REGISTER_TEST(otbStreamingImageToOGRLayerSegmentationFilterNew);
REGISTER_TEST(otbStreamingImageToOGRLayerSegmentationFilter);
-REGISTER_TEST(otbOGRDataSourceStreamStitchingFilter);
+REGISTER_TEST(otbOGRLayerStreamStitchingFilter);
REGISTER_TEST(otbHooverMatrixFilterNew);
REGISTER_TEST(otbHooverMatrixFilter);
REGISTER_TEST(otbHooverInstanceFilterNew);
--
GitLab