Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e3c4f4ba9835b2f998e82602cfc152278a3da1a0..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>
#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()
{
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] );
aType = QString::fromUtf8("Végétation clairsemée");
CPPUNIT_ASSERT_EQUAL( aType, aTypes[38] );
- CPPUNIT_ASSERT_EQUAL( QColor(
164, 25, 16
4 ), aTable->GetColor( aType ) );
+ CPPUNIT_ASSERT_EQUAL( QColor(
204, 255, 20
4 ), aTable->GetColor( aType ) );
CPPUNIT_ASSERT_EQUAL( QString( "333" ), aTable->GetAttrValue( aType ) );
aDoc->Close();
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 ) );
QString aTmpPath = QDir::tempPath() + "/st_dump.py";
CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) );
- CPPUNIT_ASSERT_SCRIPTS_EQUAL( "st_dump.py", true,
false, 2
0 );
+ CPPUNIT_ASSERT_SCRIPTS_EQUAL( "st_dump.py", true,
true,
0 );
aDoc->Close();
}
aDoc->Close();
}