Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

[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 42ad3731fbefff3bbb86fa35ac3e84bebbde2c55..2719ca7bffd38b864983cbf634434f204e38ef83 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_CalcCase.cxx
+++ b/src/HYDRO_tests/test_HYDROData_CalcCase.cxx
@@ -28,15 +28,12 @@
 #include <TestShape.h>
 #include <TopTools_ListOfShape.hxx>
 #include <AIS_DisplayMode.hxx>
-#include <Aspect_ColorScale.hxx>
 #include <QString>
 #include <QColor>
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
 
-
-const QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
-
+extern QString REF_DATA_PATH;
 
 void test_HYDROData_CalcCase::test_add_int_wires()
 {
@@ -52,7 +49,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 +73,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 +92,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
   }