Merge remote-tracking branch 'origin/BR_LCM_COMP' into BR_LAND_COVER_MAP

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_LandCoverMap.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 39e0fe3dd7c4849ba5e2bf6c5e77dc1943515224..58b80e6c999a6137209713366b4cd98b97819023 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -248,6 +248,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -257,6 +259,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_12" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -267,6 +271,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_13" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -278,6 +284,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_14" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   //
 
@@ -290,6 +298,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -299,6 +309,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_22" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -309,6 +321,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_23" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -320,6 +334,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_24" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
 }
 
@@ -345,6 +361,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -354,6 +372,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_12" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -364,6 +384,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_13" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -374,6 +396,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_14" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   //
 
@@ -386,6 +410,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -395,6 +421,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_22" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -405,6 +433,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_23" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -415,6 +445,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_24" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
 }
 
@@ -531,6 +563,11 @@ void test_HYDROData_LandCoverMap::test_dump_python()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
 
+  Handle(HYDROData_StricklerTable) aTable =
+    Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
+  CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
+  aTable->SetName( "DefStr" );
+
   Handle(HYDROData_LandCoverMap) aMap =
     Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) );
   aMap->SetName( "test_LCM" );
@@ -551,10 +588,15 @@ void test_HYDROData_LandCoverMap::test_dump_python()
                                             127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 );
   CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) );
 
-  QString aTmpPath = QDir::tempPath() + "/lc_dump.py";
+  QString aBaseName = "lc_dump.py";
+  QString aBaseShp = "lc_dump.shp";
+  QString aBaseDbf = "lc_dump.dbf";
+  QString aTmpPath = QDir::tempPath() + "/" + aBaseName;
   CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) );
 
-  //TODO: compare files
+  CPPUNIT_ASSERT_SCRIPTS_EQUAL( aBaseName, true, false, 20 );
+  //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseShp );
+  //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseDbf );
 
   aDoc->Close();
 }
@@ -973,7 +1015,7 @@ void test_HYDROData_LandCoverMap::test_export_telemac()
 
   QString aTmpFileName = "test.telemac";
   QString aTmpPath = QDir::tempPath() + "/" + aTmpFileName;
-  CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4 ) );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable ) );
   CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 );
 
   aDoc->Close();