From d96f8b24f00fe0ccf4ad4199cdd095cb1d07796a Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sat, 21 May 2016 17:21:07 +0200 Subject: [PATCH] some more HYDRO_tests corrections --- src/HYDRO_tests/reference_data/LCM_copied.png | Bin 4822 -> 4848 bytes .../test_HYDROData_StricklerTable.cxx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HYDRO_tests/reference_data/LCM_copied.png b/src/HYDRO_tests/reference_data/LCM_copied.png index 72382b9bb0d469a5eb50faf5d558cfae11e19563..3dc991616836c104739d386b133444b827b5486e 100644 GIT binary patch literal 4848 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 PscE*oGxLU>&zb)Lp^Vnd literal 4822 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 YjKq6y)rgE7O%kcMFtKDlHgb*pCzGetColor( 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(); } -- 2.39.2