X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_LandCoverMap.cxx;h=21e0440a271663141dc04ffc731c644dd8578c62;hb=a3aee81ee52b523b2c318dba1e0cc36d5d79f8bd;hp=96d6705793b33d413e4ca09d2359ddb3c0005ce2;hpb=9082efb75ca2505f8b4c5096d37e8d87491cd5d9;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 96d67057..21e0440a 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -34,7 +34,6 @@
 #include <TestShape.h>
 #include <TopTools_ListOfShape.hxx>
 #include <AIS_DisplayMode.hxx>
-#include <Aspect_ColorScale.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <QString>
 #include <QColor>
@@ -50,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 +600,7 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types()
   TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByTypes" );
   // select one of faces (first)
   TestViewer::select( 200, 300 );
-  CPPUNIT_ASSERT_IMAGES
+ // CPPUNIT_ASSERT_IMAGES
 
   aDoc->Close();
 }
@@ -808,7 +807,7 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case()
 
   aDoc->Close();
 }
-
+#include <QTest>
 void test_HYDROData_LandCoverMap::test_shp_import_cyp()
 {
   Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
@@ -835,6 +834,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_cyp()
 
   LCM->StoreLandCovers(aMapFace2ST);
   TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "cyprus_natural_all" );
+  QTest::qWait(100000);
   CPPUNIT_ASSERT_IMAGES
   aDoc->Close();
 }
@@ -1272,10 +1272,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);
 
 }