From a91766d005ebbee05989923c42f421eed31fce38 Mon Sep 17 00:00:00 2001 From: Marco Hugentobler Date: Thu, 30 Aug 2012 16:07:14 +0200 Subject: [PATCH] Fix frames in html tests --- tests/src/core/testqgscomposerhtml.cpp | 5 +---- tests/src/python/test_qgscomposerhtml.py | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp index a48a09aa62b6..033bddb15f0a 100644 --- a/tests/src/core/testqgscomposerhtml.cpp +++ b/tests/src/core/testqgscomposerhtml.cpp @@ -83,10 +83,7 @@ void TestQgsComposerHtml::tableMultiFrame() //page1 htmlItem->setUrl( QUrl( QString( "file:///%1" ).arg( QString( TEST_DATA_DIR ) + QDir::separator() + "html_table.html" ) ) ); int nFrames = htmlItem->nFrames(); - for ( int i = 0; i < nFrames; ++i ) - { - htmlItem->frame( i )->setFrameEnabled( true ); - } + htmlItem->frame( 0 )->setFrameEnabled( true ); QgsCompositionChecker checker1( "Composer html table", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + "control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table_multiframe1.png" ) ); if ( !checker1.testComposition( 0 ) ) diff --git a/tests/src/python/test_qgscomposerhtml.py b/tests/src/python/test_qgscomposerhtml.py index e5e0f69a09af..1fc6b682d253 100644 --- a/tests/src/python/test_qgscomposerhtml.py +++ b/tests/src/python/test_qgscomposerhtml.py @@ -52,9 +52,7 @@ def tableMultiFrame(self): htmlItem.setResizeMode( QgsComposerMultiFrame.RepeatUntilFinished ) htmlItem.setUrl( QUrl( QString( "file:///%1" ).arg( QString( TEST_DATA_DIR ) + QDir.separator() + "html_table.html" ) ) ) - nFrames = htmlItem.nFrames() - for i in range( nFrames ): - htmlItem.frame( i ).setFrameEnabled( True ) + htmlItem.frame( 0 ).setFrameEnabled( True ) result = True