Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017

[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 37189f939c675ee094b15f98e916fa70e4f6d396..be1326b9074d45b1f9fe1ffae78274b170d815c7 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -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);
 
 }