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=a7c2da126e81bec5763c0da90480f39290d411fd;hpb=fdfbecc502e984321f7e660d64e6031df35e26c2;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx index a7c2da12..830a0aa4 100644 --- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx +++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx @@ -18,13 +18,17 @@ #include #include +#include #include #include -#include +#include +#include #include #include +#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() { @@ -36,18 +40,18 @@ void test_HYDROData_StricklerTable::test_import() CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); QStringList aTypes = aTable->GetTypes(); - CPPUNIT_ASSERT_EQUAL( 8, aTypes.size() ); + CPPUNIT_ASSERT_EQUAL( 44, aTypes.size() ); CPPUNIT_ASSERT_EQUAL( QString( "CODE_06" ), aTable->GetAttrName() ); - QString aType = "Zones de champs cultivé à végétation basse"; - CPPUNIT_ASSERT_EQUAL( aType, aTypes[3] ); + 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( "512" ), aTable->GetAttrValue( aType ) ); + CPPUNIT_ASSERT_EQUAL( QString( "212" ), aTable->GetAttrValue( aType ) ); - aType = "Zones à forte urbanization (agglomération)"; - CPPUNIT_ASSERT_EQUAL( aType, aTypes[7] ); - CPPUNIT_ASSERT_EQUAL( QColor( 18, 52, 86 ), aTable->GetColor( aType ) ); - CPPUNIT_ASSERT_EQUAL( QString( "" ), aTable->GetAttrValue( aType ) ); + aType = QString::fromUtf8("Végétation clairsemée"); + CPPUNIT_ASSERT_EQUAL( aType, aTypes[38] ); + CPPUNIT_ASSERT_EQUAL( QColor( 204, 255, 204 ), aTable->GetColor( aType ) ); + CPPUNIT_ASSERT_EQUAL( QString( "333" ), aTable->GetAttrValue( aType ) ); aDoc->Close(); } @@ -70,13 +74,13 @@ void test_HYDROData_StricklerTable::test_import_export_equivalence() QByteArray aRefContents = aRefFile.readAll(); QByteArray aTmpContents = aTmpFile.readAll(); - bool isEqual = aRefContents.size()==aTmpContents.size(); - CPPUNIT_ASSERT_EQUAL( true, isEqual ); - for( int i=0, n=aRefContents.size(); isEqual && iImport( DEF_STR_PATH ) ); - CPPUNIT_ASSERT_EQUAL( QString( "Zones de champs cultivé à végétation basse" ), aTable->GetType( "512" ) ); - CPPUNIT_ASSERT_EQUAL( QString( "" ), aTable->GetType( "123" ) ); + CPPUNIT_ASSERT_EQUAL( QString( "Plans d'eau" ), aTable->GetType( "512" ) ); + CPPUNIT_ASSERT_EQUAL( QString( "" ), aTable->GetType( "125" ) ); CPPUNIT_ASSERT_EQUAL( QString( "" ), aTable->GetType( "" ) ); aDoc->Close(); @@ -150,3 +154,85 @@ void test_HYDROData_StricklerTable::test_colors_sync() aDoc->Close(); } + +void test_HYDROData_StricklerTable::test_duplication_refs_613() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_StricklerTable) aTable1 = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + aTable1->Set( "type1", 1.5 ); + aTable1->SetColor( "type1", QColor( 10, 20, 30 ) ); + aTable1->SetName( "DefStrickler_1" ); + + Handle(HYDROData_StricklerTable) aTable2 = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + aTable1->CopyTo( aTable2, true ); + + CPPUNIT_ASSERT_EQUAL( QString( "DefStrickler_2" ), aTable2->GetName() ); + CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.5, aTable2->Get( "type1", 0.0 ), 1E-5 ); + CPPUNIT_ASSERT_EQUAL( QColor( 10, 20, 30 ), aTable2->GetColor( "type1" ) ); + + aDoc->StartOperation(); + aTable1->Remove(); + aTable2->Remove(); + Handle(HYDROData_StricklerTable) aTable3 = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + aTable3->SetName( "DefStrickler_1" ); + aDoc->CommitOperation(); + + HYDROData_Iterator anIt1( aDoc, KIND_STRICKLER_TABLE ); + CPPUNIT_ASSERT_EQUAL( true, anIt1.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "DefStrickler_1" ), anIt1.Current()->GetName() ); + anIt1.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt1.More() ); + + aDoc->Undo(); + + HYDROData_Iterator anIt2( aDoc, KIND_STRICKLER_TABLE ); + CPPUNIT_ASSERT_EQUAL( true, anIt2.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "DefStrickler_1" ), anIt2.Current()->GetName() ); + anIt2.Next(); + CPPUNIT_ASSERT_EQUAL( true, anIt2.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "DefStrickler_2" ), anIt2.Current()->GetName() ); + anIt2.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt2.More() ); + + aDoc->Close(); +} + +void test_HYDROData_StricklerTable::test_dump_python() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + 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"; + CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) ); + + 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_StricklerTable) aTable = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + + CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); + + HYDROGUI_StricklerTableDlg* aDlg = new HYDROGUI_StricklerTableDlg( 0, "", 0 ); + aDlg->setGuiData( aTable ); + CPPUNIT_ASSERT_EQUAL( 44, aDlg->myTable->rowCount() ); + aDlg->onAddCoefficient(); + aDlg->getGuiData( aTable ); + + aDlg->deleteLater(); + aDoc->Close(); +}