From c4fa7ea1148688efbce9728f08fcc1c2f1ffb9b1 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Tue, 4 Dec 2012 14:15:54 +0100
Subject: [PATCH] TEST: Enhancing tests on RpcSolverAdapter
---
Testing/Code/UtilitiesAdapters/CMakeLists.txt | 9 +++++++++
.../Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx | 10 +++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Testing/Code/UtilitiesAdapters/CMakeLists.txt b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
index e7e06978d7..4e70646a26 100644
--- a/Testing/Code/UtilitiesAdapters/CMakeLists.txt
+++ b/Testing/Code/UtilitiesAdapters/CMakeLists.txt
@@ -42,6 +42,15 @@ ADD_TEST(uaTvRPCSolverAdapterValidationTest
${INPUTDATA}/DEM/egm96.grd
)
+ADD_TEST(uaTvRPCSolverAdapterNoDEMValidationTest
+ ${UtilitiesAdapters_TESTS1}
+ otbRPCSolverAdapterTest
+ ${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
+ 10 0.25 0.35
+ no
+ no
+)
+
ADD_TEST(uaTvRPCSolverAdapterOutGeomTest
${UtilitiesAdapters_TESTS1}
--compare-ascii ${EPSILON_9}
diff --git a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
index 61e948f3e9..70c2f464ec 100644
--- a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
+++ b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
@@ -49,8 +49,12 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
std::cout<<"GeoTol: "<<geoTol<<" meters"<<std::endl;
std::cout<<"ImgTol: "<<imgTol<<" pixels"<<std::endl;
- otb::DEMHandler::Instance()->OpenDEMDirectory(demdir);
- otb::DEMHandler::Instance()->OpenGeoidFile(geoid);
+ otb::DEMHandler::Pointer demHandler = otb::DEMHandler::Instance();
+ demHandler->SetDefaultHeightAboveEllipsoid(0);
+ if(demdir!="no")
+ demHandler->OpenDEMDirectory(demdir);
+ if(geoid!="no")
+ demHandler->OpenGeoidFile(geoid);
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
@@ -90,7 +94,7 @@ int otbRPCSolverAdapterTest(int argc, char* argv[])
gcps.push_back(std::make_pair(currentPoint,current3DWgs84Point));
- std::cout<<"Adding gcp: "<<currentPoint<<" <-> " << current3DWgs84Point<<std::endl;
+ std::cout<<currentPoint[0]<<" "<<currentPoint[1]<<" "<< current3DWgs84Point[0]<<" "<<current3DWgs84Point[1]<<" "<<current3DWgs84Point[2]<<std::endl;
}
}
--
GitLab