X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_LandCoverMap.cxx;h=be1326b9074d45b1f9fe1ffae78274b170d815c7;hb=ba53436c18b7ed378d149952aff0b5ecafc3e902;hp=488c212745613103d6eff0b212d4b73b1710c257;hpb=ad4482443835973ac9ee0ce2024f60f91adff716;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 488c2127..be1326b9 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -49,7 +49,7 @@
 #include "HYDRO_trace.hxx"
 
 extern QString REF_DATA_PATH;
-const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
+const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table_06.txt";
 
 void test_HYDROData_LandCoverMap::test_add_2_objects()
 {
@@ -601,7 +601,7 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
   // select one of faces (first)
   TestViewer::select( 200, 300 );
   CPPUNIT_ASSERT_IMAGES
-
+  TestViewer::eraseAll(true, true);
   aDoc->Close();
 }
 
@@ -807,9 +807,11 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case()
 
   aDoc->Close();
 }
-
+#include <QTest>
 void test_HYDROData_LandCoverMap::test_shp_import_cyp()
 {
+  //TestViewer::eraseAll(true);
+
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
   QString aFileName = REF_DATA_PATH + "/cyprus_natural.shp";
   HYDROData_ShapeFile anImporter;
@@ -1271,10 +1273,10 @@ void test_HYDROData_LandCoverMap::test_shp_clc_classification_check()
   CPPUNIT_ASSERT_EQUAL (coeffs[0], 0.0);
   CPPUNIT_ASSERT_EQUAL (coeffs[1], 0.0);
   CPPUNIT_ASSERT_EQUAL (coeffs[2], 0.0);
-  CPPUNIT_ASSERT_EQUAL (coeffs[3], 1.0522);
-  CPPUNIT_ASSERT_EQUAL (coeffs[4], 1.0223);
-  CPPUNIT_ASSERT_EQUAL (coeffs[5], 1.0221);
-  CPPUNIT_ASSERT_EQUAL (coeffs[6], 1.0522);
+  CPPUNIT_ASSERT_EQUAL (coeffs[3], 98.0);
+  CPPUNIT_ASSERT_EQUAL (coeffs[4], 26.0);
+  CPPUNIT_ASSERT_EQUAL (coeffs[5], 24.0);
+  CPPUNIT_ASSERT_EQUAL (coeffs[6], 98.0);
 
 }