X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_StricklerTable.cxx;h=830a0aa48acdd018861ace8d3287977222eb86cd;hb=a3aee81ee52b523b2c318dba1e0cc36d5d79f8bd;hp=e3c4f4ba9835b2f998e82602cfc152278a3da1a0;hpb=517847e04bdabf9ca12e97a68b7a9252df42813d;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx index e3c4f4ba..830a0aa4 100644 --- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx +++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx @@ -28,7 +28,7 @@ #include #include -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() { @@ -50,7 +50,7 @@ void test_HYDROData_StricklerTable::test_import() 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( 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(); }