refs #1048

[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 a66ae5ef73181787d0930d5deb528ff34b9e4aef..d4cbc6ee6c211459001f9422953fc579f4baa16e 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -49,7 +49,7 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
-const QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
+extern QString REF_DATA_PATH;
 const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
 
 void test_HYDROData_LandCoverMap::test_add_2_objects()
@@ -1100,7 +1100,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, aTable ) );
+  QString messStat;
+  CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable, messStat ) );
   CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 );
 
   aDoc->Close();
@@ -1182,7 +1183,7 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
 
   LCM->StoreLandCovers(aMapFace2ST);
 
-  std::vector<gp_Pnt2d> pnts;
+  std::vector<gp_XY> pnts;
 #ifdef NDEBUG
   int N = 1000; //1000*1000 points; uniform distribution for release mode
 #else
@@ -1200,7 +1201,7 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf()
     {
       double px = x0 + (x1-x0)*((double)i/(double)N);
       double py = y0 + (y1-y0)*((double)j/(double)N);
-      pnts.push_back(gp_Pnt2d(px,py));
+      pnts.push_back(gp_XY(px,py));
     }
   }
   OSD_Timer aTimer;
@@ -1238,7 +1239,7 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
 
   TopoDS_Shape Sh = LCM->GetShape();
 
-  std::vector<gp_Pnt2d> pnts;
+  std::vector<gp_XY> pnts;
   pnts.push_back(gp_XY(0,0));
 
   pnts.push_back(gp_XY(468380, 6382300));
@@ -1278,24 +1279,3 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
 
 }
 
-void test_HYDROData_LandCoverMap::test_add_int_edges_1()
-{
-  TopoDS_Shape out;
-  TopTools_ListOfShape Wires;
-
-  BRep_Builder B;
-  TopoDS_Shape InF;
-  TopoDS_Shape InP;
-  BRepTools::Read(InP, "d:/p2.brep", B); //TODO
-  BRepTools::Read(InF, "d:/r2.brep", B);
-  Wires.Append(InP);
-
-  TopTools_ListOfShape OutSh;
-  HYDROData_SplitToZonesTool::CutByEdges(InF, Wires, OutSh);
-  TopTools_ListIteratorOfListOfShape it(OutSh);
-  for (;it.More();it.Next())
-  {
-    TopoDS_Shape Sh = it.Value();
-  }
-}
-