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 e0036fc69ec0859bdec3fdfab67093be3a10e1ed..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;
@@ -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());
   }
 }