Skip to content
Permalink
Browse files

Fix frames in html tests

  • Loading branch information
Marco Hugentobler
Marco Hugentobler committed Aug 30, 2012
1 parent 4a97a92 commit a91766d005ebbee05989923c42f421eed31fce38
Showing with 2 additions and 7 deletions.
  1. +1 −4 tests/src/core/testqgscomposerhtml.cpp
  2. +1 −3 tests/src/python/test_qgscomposerhtml.py
@@ -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 ) )
@@ -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

0 comments on commit a91766d

Please sign in to comment.
You can’t perform that action at this time.