test_merge_faces() // corrections

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 4d538c99d05099b6496b74b892712bc846b74ab2..e1589b7b13e913c608eb996b7b91eacb58460908 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -273,8 +273,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp1);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs11" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs11" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
   }
   {
@@ -282,8 +282,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp1);
     Faces.Append(pp3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs12" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs12" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -292,8 +292,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp2);
     Faces.Append(pp4);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs13" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs13" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -303,8 +303,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp4);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs14" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs14" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
   }
   //
@@ -315,8 +315,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp1);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs21" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs21" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -324,8 +324,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp1);
     Faces.Append(pp3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs22" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs22" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -334,8 +334,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp2);
     Faces.Append(pp4);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs23" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs23" );
+   CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
   {
@@ -345,8 +345,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces()
     Faces.Append(pp4);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true );
-    TestViewer::AssertEqual( "cs24" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs24" );
+    CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
 }