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

[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 4ace894540802fcb20f3de883c2db2a4cdd2e4d3..58b80e6c999a6137209713366b4cd98b97819023 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -64,7 +64,7 @@ void test_HYDROData_LandCoverMap::test_add_2_objects()
   TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Add_2_Objects" );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
@@ -99,7 +99,7 @@ void test_HYDROData_LandCoverMap::test_split()
   TestViewer::show( aWire, 0, true, Qt::blue );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
@@ -134,7 +134,7 @@ void test_HYDROData_LandCoverMap::test_incomplete_split()
   TestViewer::show( aWire, 0, true, Qt::green );
   CPPUNIT_ASSERT_IMAGES
 
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
   CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
   CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
   anIt.Next();
@@ -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;
@@ -256,7 +258,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_12" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -266,7 +270,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_13" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    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;
@@ -298,7 +308,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_22" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -308,7 +320,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_23" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    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;
@@ -353,7 +371,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_12" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -363,7 +383,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_13" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -373,7 +395,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_14" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    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;
@@ -394,7 +420,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_22" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -404,7 +432,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_23" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
   {
     TopTools_ListOfShape Faces;
@@ -414,7 +444,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
     TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_24" );
     CPPUNIT_ASSERT_IMAGES
-    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
+    CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND);
+    BRepCheck_Analyzer aBCA(aMergedFace);
+    CPPUNIT_ASSERT(aBCA.IsValid());
   }
 }
 
@@ -448,7 +480,7 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
   QList<int> Inds = QList<int>() << 1 << 2 << 3;
   aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds);
-  HYDROData_LandCoverMap::Iterator anIt( aMap );
+  HYDROData_LandCoverMap::Explorer anIt( aMap );
  
   CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() );
   anIt.Next();
@@ -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();
 }
@@ -658,6 +700,7 @@ void test_HYDROData_LandCoverMap::test_add_triangles()
   CPPUNIT_ASSERT_EQUAL( true, aMap->Add( Polyline_4, "" ) );
 
   Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap );
+  TopoDS_Shape aSh = aMap->GetShape();
   TestViewer::show( aPrs, AIS_Shaded, 0, true, "LandCover_Triangles" );
   CPPUNIT_ASSERT_IMAGES
 
@@ -972,8 +1015,8 @@ 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_SCRIPTS_EQUAL( aTmpFileName );
+  CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable ) );
+  CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 );
 
   aDoc->Close();
 }