From c27fe366fcb92ebbaf459b0998011ec26a512212 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Mon, 9 May 2016 08:49:18 +0200 Subject: [PATCH] HYDRO_tests working on install, building with yamm --- src/HYDRO_tests/CMakeLists.txt | 6 ++++-- src/HYDRO_tests/reference_data/CLC06-cut_1.dbf | Bin 0 -> 842 bytes src/HYDRO_tests/reference_data/CLC06-cut_1.shp | Bin 0 -> 19372 bytes src/HYDRO_tests/reference_data/CLC06-cut_1.shx | Bin 0 -> 396 bytes src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx | 14 ++++++++++++-- src/HYDRO_tests/test_HYDROData_Main.cxx | 1 + 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/HYDRO_tests/reference_data/CLC06-cut_1.dbf create mode 100644 src/HYDRO_tests/reference_data/CLC06-cut_1.shp create mode 100644 src/HYDRO_tests/reference_data/CLC06-cut_1.shx diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt index 35932e15..b77ef953 100644 --- a/src/HYDRO_tests/CMakeLists.txt +++ b/src/HYDRO_tests/CMakeLists.txt @@ -59,7 +59,7 @@ IF( ${WIN32} ) add_definitions( -DWNT ) ENDIF() -SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include ) +SET( CPPUNIT_INCLUDES $ENV{cppUNIT_ROOT}/include ) SET( CAS_INCLUDES $ENV{CASROOT}/inc ) SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QTDIR}/include/QtCore $ENV{QTDIR}/include/QtGui $ENV{QTDIR}/include/QtTest ) SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome ) @@ -80,7 +80,7 @@ ELSE() SET( QT_LIBRARIES QtCore QtGui QtTest ) ENDIF() -link_directories( $ENV{CPPUNIT_ROOT}/lib ) +link_directories( $ENV{cppUNIT_ROOT}/lib ) IF( ${WIN32} ) SET( CPPUNIT_LIBRARIES cppunitd ) ELSE() @@ -111,3 +111,5 @@ target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_ IF( ${WIN32} ) add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" ) ENDIF() + +INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) diff --git a/src/HYDRO_tests/reference_data/CLC06-cut_1.dbf b/src/HYDRO_tests/reference_data/CLC06-cut_1.dbf new file mode 100644 index 0000000000000000000000000000000000000000..5b19ee25c893e4759067179cc9e323ce160ecd11 GIT binary patch literal 842 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 #include -const QString REF_DATA_PATH = qgetenv( "HYDRO_REFERENCE_DATA" ); -const QString DEF_STR_PATH = qgetenv( "HYDRO_SRC_DIR" ) + "/src/HYDROGUI/resources/def_strickler_table.txt"; +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + +//const QString REF_DATA_PATH = qgetenv( "HYDRO_REFERENCE_DATA" ); +const QString REF_DATA_PATH = qgetenv( "HYDRO_DIR" ) + "/../../src/HYDRO/src/HYDRO_tests/reference_data"; +const QString DEF_STR_PATH = qgetenv( "HYDRO_DIR" ) + "/../../src/HYDRO/src/HYDROGUI/resources/def_strickler_table.txt"; void test_HYDROData_LandCoverMap::test_add_2_objects() { @@ -882,13 +886,17 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() { QString aFFileName = REF_DATA_PATH + "/CLC06-cut_1.shp"; QString aSFileName = REF_DATA_PATH + "/CLC06-cut_1_res.shp"; + //This test verify only some geom data (shp+shx) without any dbf reading/writing { + DEBTRACE("aFFileName: " << aFFileName.toStdString()); + DEBTRACE("aSFileName: " << aSFileName.toStdString()); Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); HYDROData_ShapeFile anImporter; QStringList PolygonList; TopTools_SequenceOfShape PolygonFaces; int Type = -1; + DEBTRACE("---"); //import LCM from file (#2-4; #12-14 polygons) CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aFFileName, PolygonList, PolygonFaces, Type)); @@ -901,6 +909,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() aMapFace2ST.Add( TopoDS::Face( PolygonFaces(12) ), "" ); aMapFace2ST.Add( TopoDS::Face( PolygonFaces(13) ), "" ); aMapFace2ST.Add( TopoDS::Face( PolygonFaces(14) ), "" ); + DEBTRACE("---"); LCM->StoreLandCovers(aMapFace2ST); LCM->SetName("lcm_1"); @@ -914,6 +923,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() QStringList aNonExpList; anExporter.Export(aSFileName, LCM, aNonExpList); CPPUNIT_ASSERT (aNonExpList.empty()); + DEBTRACE("---"); aDoc->Close(); } diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx index 74bb9315..c4e3239e 100644 --- a/src/HYDRO_tests/test_HYDROData_Main.cxx +++ b/src/HYDRO_tests/test_HYDROData_Main.cxx @@ -34,6 +34,7 @@ int main( int argc, char* argv[] ) { QApplication anApp( argc, argv ); SUIT_Session aSession; + aSession.startApplication("std"); OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow(); -- 2.39.2