Merge branch 'BR_HYDRO_IMPS_2016' of ssh://gitolite3@git.salome-platform.org/modules...

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

diff --git a/src/HYDRO_tests/test_HYDROData_CalcCase.cxx b/src/HYDRO_tests/test_HYDROData_CalcCase.cxx
index fdec7023eea0c18c2751bc5067c5a125fcf87834..028684913046d63529a264a6f9289b7e4f055971 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_CalcCase.cxx
+++ b/src/HYDRO_tests/test_HYDROData_CalcCase.cxx
@@ -28,7 +28,6 @@
 #include <TestShape.h>
 #include <TopTools_ListOfShape.hxx>
 #include <AIS_DisplayMode.hxx>
-#include <Aspect_ColorScale.hxx>
 #include <QString>
 #include <QColor>
 #include <BRep_Builder.hxx>
@@ -52,7 +51,9 @@ void test_HYDROData_CalcCase::test_add_int_wires()
     Wires.Append(InP);
 
     TopTools_ListOfShape OutSh;
-    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh);
+    TopTools_IndexedDataMapOfShapeShape ls;
+    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh, &ls, NULL);
+
     CPPUNIT_ASSERT_EQUAL(2, OutSh.Extent());
     TopoDS_Compound cmp;
     B.MakeCompound(cmp);
@@ -74,7 +75,8 @@ void test_HYDROData_CalcCase::test_add_int_wires()
     Wires.Append(InP);
 
     TopTools_ListOfShape OutSh;
-    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh);
+    TopTools_IndexedDataMapOfShapeShape ls;
+    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh, &ls, NULL);
     CPPUNIT_ASSERT_EQUAL(1, OutSh.Extent());
     TestViewer::show( OutSh.First(), AIS_WireFrame, true, "cc_int_w_2" );
     //CPPUNIT_ASSERT_IMAGES
@@ -92,9 +94,10 @@ void test_HYDROData_CalcCase::test_add_int_wires()
     Wires.Append(InP);
 
     TopTools_ListOfShape OutSh;
-    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh);
+    TopTools_IndexedDataMapOfShapeShape ls;
+    HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh, &ls, NULL);
     CPPUNIT_ASSERT_EQUAL(1, OutSh.Extent());
-    TestViewer::show( OutSh.First(), AIS_WireFrame, true, "cc_int_w_3" );
+    TestViewer::show( OutSh.First(), AIS_WireFrame, true, "cc_int_w_3", 1, 1 );
     CPPUNIT_ASSERT_IMAGES
   }