X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_StricklerTable.cxx;h=659d490134bcd0c1cf183e8f60d4d8f298fe8411;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;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..659d4901 100644
--- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
+++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
@@ -28,11 +28,12 @@
 #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";
+extern QString TMP_DIR;
 
 void test_HYDROData_StricklerTable::test_import()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -50,7 +51,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();
@@ -58,13 +59,13 @@ void test_HYDROData_StricklerTable::test_import()
 
 void test_HYDROData_StricklerTable::test_import_export_equivalence()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
 
   CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
-  QString aTmpPath = QDir::tempPath() + "/stricker.txt";
+  QString aTmpPath = TMP_DIR + "/stricker.txt";
   CPPUNIT_ASSERT_EQUAL( true, aTable->Export( aTmpPath ) );
 
   QFile aRefFile( DEF_STR_PATH ), aTmpFile( aTmpPath );
@@ -89,7 +90,7 @@ void test_HYDROData_StricklerTable::test_import_export_equivalence()
 
 void test_HYDROData_StricklerTable::test_type_by_attr()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -105,7 +106,7 @@ void test_HYDROData_StricklerTable::test_type_by_attr()
 
 void test_HYDROData_StricklerTable::test_unique_attr_name()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable1 =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -133,7 +134,7 @@ void test_HYDROData_StricklerTable::test_unique_attr_name()
 
 void test_HYDROData_StricklerTable::test_colors_sync()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable1 =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -157,7 +158,7 @@ void test_HYDROData_StricklerTable::test_colors_sync()
 
 void test_HYDROData_StricklerTable::test_duplication_refs_613()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable1 =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
@@ -203,24 +204,25 @@ void test_HYDROData_StricklerTable::test_duplication_refs_613()
 
 void test_HYDROData_StricklerTable::test_dump_python()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );
   aTable->SetName( "ST" );
   CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) );
 
-  QString aTmpPath = QDir::tempPath() + "/st_dump.py";
+  QString aTmpPath = TMP_DIR + "/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();
 }
 
 void test_HYDROData_StricklerTable::test_add_row_in_gui_refs_717()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_StricklerTable) aTable =
     Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) );