Fix html test

mhugent · mhugent · commit 12f521eb559e · 2012-08-08T18:47:52.000+02:00
diff --git a/tests/src/core/qgscompositionchecker.cpp b/tests/src/core/qgscompositionchecker.cpp
@@ -41,7 +41,8 @@ bool QgsCompositionChecker::testComposition( int page )
     return false;
   }
 
-#if 0 //fake mode to generate expected image
+#if 0
+  //fake mode to generate expected image
   //assume 300 dpi and size of the control image 3507 * 2480
   QImage outputImage( QSize( 3507, 2480 ), QImage::Format_ARGB32 );
   mComposition->setPlotStyle( QgsComposition::Print );
diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -74,7 +74,7 @@ void TestQgsComposerHtml::table()
 void TestQgsComposerHtml::tableMultiFrame()
 {
   QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, false );
-  QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 0, 0, 100, 200 );
+  QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 10, 10, 100, 50 );
   htmlItem->addFrame( htmlFrame );
   htmlItem->setResizeMode( QgsComposerMultiFrame::ExtendToNextPage );
   bool result = true;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ bool QgsCompositionChecker::testComposition( int page )`
`41`	`41`	`return false;`
`42`	`42`	`}`
`43`	`43`
`44`		`-#if 0 //fake mode to generate expected image`
	`44`	`+#if 0`
	`45`	`+ //fake mode to generate expected image`
`45`	`46`	`//assume 300 dpi and size of the control image 3507 * 2480`
`46`	`47`	`QImage outputImage( QSize( 3507, 2480 ), QImage::Format_ARGB32 );`
`47`	`48`	`mComposition->setPlotStyle( QgsComposition::Print );`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void TestQgsComposerHtml::table()`
`74`	`74`	`void TestQgsComposerHtml::tableMultiFrame()`
`75`	`75`	`{`
`76`	`76`	`QgsComposerHtml* htmlItem = new QgsComposerHtml( mComposition, false );`
`77`		`- QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 0, 0, 100, 200 );`
	`77`	`+ QgsComposerFrame* htmlFrame = new QgsComposerFrame( mComposition, htmlItem, 10, 10, 100, 50 );`
`78`	`78`	`htmlItem->addFrame( htmlFrame );`
`79`	`79`	`htmlItem->setResizeMode( QgsComposerMultiFrame::ExtendToNextPage );`
`80`	`80`	`bool result = true;`