Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_StricklerTable.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
index c3248c5428868f0ac3d6faa2a01d2ad873cf2875..830a0aa48acdd018861ace8d3287977222eb86cd 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
+++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
@@ -28,7 +28,7 @@
 #include <QStringList>
 #include <QTableWidget>
 
-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_StricklerTable::test_import()
 {
@@ -43,15 +43,15 @@ void test_HYDROData_StricklerTable::test_import()
   CPPUNIT_ASSERT_EQUAL( 44, aTypes.size() );
   CPPUNIT_ASSERT_EQUAL( QString( "CODE_06" ), aTable->GetAttrName() );
 
-  QString aType = "Périmètres irrigués en permanence";
+  QString aType = QString::fromUtf8("Périmètres irrigués en permanence");
   CPPUNIT_ASSERT_EQUAL( aType, aTypes[25] );
   CPPUNIT_ASSERT_EQUAL( QColor( 255, 255, 0 ), aTable->GetColor( aType ) );
   CPPUNIT_ASSERT_EQUAL( QString( "212" ), aTable->GetAttrValue( aType ) );
 
-  aType = "Végétation clairsemée";
+  aType = QString::fromUtf8("Végétation clairsemée");
   CPPUNIT_ASSERT_EQUAL( aType, aTypes[38] );
-  CPPUNIT_ASSERT_EQUAL( QColor( 164, 25, 164 ), aTable->GetColor( aType ) );
-  CPPUNIT_ASSERT_EQUAL( QString( "" ), aTable->GetAttrValue( aType ) );
+  CPPUNIT_ASSERT_EQUAL( QColor( 204, 255, 204 ), aTable->GetColor( aType ) );
+  CPPUNIT_ASSERT_EQUAL( QString( "333" ), aTable->GetAttrValue( aType ) );
 
   aDoc->Close();
 }
@@ -213,7 +213,7 @@ void test_HYDROData_StricklerTable::test_dump_python()
   QString aTmpPath = QDir::tempPath() + "/st_dump.py";
   CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) );
   
-  CPPUNIT_ASSERT_SCRIPTS_EQUAL( "st_dump.py", true, false, 20 );
+  CPPUNIT_ASSERT_SCRIPTS_EQUAL( "st_dump.py", true, true, 0 );
 
   aDoc->Close();
 }