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 21e0440a271663141dc04ffc731c644dd8578c62..be1326b9074d45b1f9fe1ffae78274b170d815c7 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -600,8 +600,8 @@ 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
+  TestViewer::eraseAll(true, true);
   aDoc->Close();
 }
 
@@ -810,6 +810,8 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case()
 #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;
@@ -834,7 +836,6 @@ 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();
 }