Use a non-transparent background for composition checker

Fix composerhtml tests on precise
qgis · Nov 14, 2014 · 2cfcca1
1 parent eaf0d34
commit 2cfcca1
Show file tree

Hide file tree

Showing 113 changed files with 31 additions and 5 deletions.
diff --git a/tests/src/core/qgscompositionchecker.cpp b/tests/src/core/qgscompositionchecker.cpp
@@ -40,6 +40,27 @@ QgsCompositionChecker::~QgsCompositionChecker()
 {
 }
 
+void QgsCompositionChecker::drawBackround( QImage* image )
+{
+  // create a 2x2 checker-board image
+  uchar pixDataRGB[] = { 255, 255, 255, 255,
+                         127, 127, 127, 255,
+                         127, 127, 127, 255,
+                         255, 255, 255, 255
+                       };
+
+  QImage img( pixDataRGB, 2, 2, 8, QImage::Format_ARGB32 );
+  QPixmap pix = QPixmap::fromImage( img.scaled( 20, 20 ) );
+
+  // fill image with texture
+  QBrush brush;
+  brush.setTexture( pix );
+  QPainter p( image );
+  p.setRenderHint( QPainter::Antialiasing, false );
+  p.fillRect( QRect( 0, 0, image->width(), image->height() ), brush );
+  p.end();
+}
+
 bool QgsCompositionChecker::testComposition( QString &theReport, int page, int pixelDiff )
 {
   if ( !mComposition )
@@ -56,7 +77,7 @@ bool QgsCompositionChecker::testComposition( QString &theReport, int page, int p
   mComposition->setPlotStyle( QgsComposition::Print );
   newImage.setDotsPerMeterX( 96 / 25.4 * 1000 );
   newImage.setDotsPerMeterY( 96 / 25.4 * 1000 );
-  newImage.fill( 0 );
+  drawBackround( &newImage );
   QPainter expectedPainter( &newImage );
   //QRectF sourceArea( 0, 0, mComposition->paperWidth(), mComposition->paperHeight() );
   //QRectF targetArea( 0, 0, 3507, 2480 );
@@ -71,7 +92,7 @@ bool QgsCompositionChecker::testComposition( QString &theReport, int page, int p
   mComposition->setPlotStyle( QgsComposition::Print );
   outputImage.setDotsPerMeterX( mDotsPerMeter );
   outputImage.setDotsPerMeterY( mDotsPerMeter );
-  outputImage.fill( 0 );
+  drawBackround( &outputImage );
   QPainter p( &outputImage );
   mComposition->renderPage( &p, page );
   p.end();

diff --git a/tests/src/core/qgscompositionchecker.h b/tests/src/core/qgscompositionchecker.h
@@ -29,11 +29,16 @@ class QgsCompositionChecker : public QgsMultiRenderChecker
     QgsCompositionChecker( const QString& testName, QgsComposition* composition );
     ~QgsCompositionChecker();
 
-    bool testComposition( QString &report, int page = 0, int pixelDiff = 0 );
+    bool testComposition( QString &theReport, int page = 0, int pixelDiff = 0 );
 
   private:
     QgsCompositionChecker(); //forbidden
 
+    /**Draws a checkboard pattern for image backgrounds, so that transparency is visible
+     * without requiring a transparent background for the image
+     */
+    void drawBackround( QImage* image );
+
     QString mTestName;
     QgsComposition* mComposition;
     QSize mSize;

diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -95,7 +95,7 @@ void TestQgsComposerHtml::sourceMode()
   htmlItem->loadHtml();
 
   QgsCompositionChecker checker( "composerhtml_manual", mComposition );
-  bool result = checker.testComposition( mReport );
+  bool result = checker.testComposition( mReport, 0, 100 );
   mComposition->removeMultiFrame( htmlItem );
   delete htmlItem;
   QVERIFY( result );
@@ -116,7 +116,7 @@ void TestQgsComposerHtml::userStylesheets()
   htmlItem->setUserStylesheetEnabled( true );
 
   QgsCompositionChecker checker( "composerhtml_userstylesheet", mComposition );
-  bool result = checker.testComposition( mReport );
+  bool result = checker.testComposition( mReport, 0, 100 );
   mComposition->removeMultiFrame( htmlItem );
   delete htmlItem;
   QVERIFY( result );

diff --git a/...testdata/control_images/expected_atlas_autoscale1/expected_atlas_autoscale1.png b/...testdata/control_images/expected_atlas_autoscale1/expected_atlas_autoscale1.png
diff --git a/...testdata/control_images/expected_atlas_autoscale2/expected_atlas_autoscale2.png b/...testdata/control_images/expected_atlas_autoscale2/expected_atlas_autoscale2.png
diff --git a/..._images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png b/..._images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png
diff --git a/..._images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png b/..._images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png
diff --git a/...testdata/control_images/expected_atlas_filtering1/expected_atlas_filtering1.png b/...testdata/control_images/expected_atlas_filtering1/expected_atlas_filtering1.png
diff --git a/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png b/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png
diff --git a/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png b/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png
diff --git a/...mages/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png b/...mages/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png
diff --git a/...mages/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png b/...mages/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding1/expected_atlas_hiding1.png b/tests/testdata/control_images/expected_atlas_hiding1/expected_atlas_hiding1.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding2/expected_atlas_hiding2.png b/tests/testdata/control_images/expected_atlas_hiding2/expected_atlas_hiding2.png
diff --git a/...ol_images/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1.png b/...ol_images/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1.png
diff --git a/...ol_images/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2.png b/...ol_images/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting1/expected_atlas_sorting1.png b/tests/testdata/control_images/expected_atlas_sorting1/expected_atlas_sorting1.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2.png b/tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png b/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png b/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png
diff --git a/...poserattributetable_columnwidth/expected_composerattributetable_columnwidth.png b/...poserattributetable_columnwidth/expected_composerattributetable_columnwidth.png
diff --git a/..._composerattributetable_drawempty/expected_composerattributetable_drawempty.png b/..._composerattributetable_drawempty/expected_composerattributetable_drawempty.png
diff --git a/...poserattributetable_headersonly/expected_composerattributetable_headersonly.png b/...poserattributetable_headersonly/expected_composerattributetable_headersonly.png
diff --git a/..._composerattributetable_hidetable/expected_composerattributetable_hidetable.png b/..._composerattributetable_hidetable/expected_composerattributetable_hidetable.png
diff --git a/...pected_composerattributetable_render/expected_composerattributetable_render.png b/...pected_composerattributetable_render/expected_composerattributetable_render.png
diff --git a/...poserattributetable_showmessage/expected_composerattributetable_showmessage.png b/...poserattributetable_showmessage/expected_composerattributetable_showmessage.png
diff --git a/...ontrol_images/expected_composereffects_blend/expected_composereffects_blend.png b/...ontrol_images/expected_composereffects_blend/expected_composereffects_blend.png
diff --git a/...expected_composereffects_transparency/expected_composereffects_transparency.png b/...expected_composereffects_transparency/expected_composereffects_transparency.png
diff --git a/...omposerhtml_expressions_disabled/expected_composerhtml_expressions_disabled.png b/...omposerhtml_expressions_disabled/expected_composerhtml_expressions_disabled.png
diff --git a/..._composerhtml_expressions_enabled/expected_composerhtml_expressions_enabled.png b/..._composerhtml_expressions_enabled/expected_composerhtml_expressions_enabled.png
diff --git a/...ta/control_images/expected_composerhtml_manual/expected_composerhtml_manual.png b/...ta/control_images/expected_composerhtml_manual/expected_composerhtml_manual.png
diff --git a/...me1/expected_composerhtml_multiframe1.png → ...ult/expected_composerhtml_multiframe1.png b/...me1/expected_composerhtml_multiframe1.png → ...ult/expected_composerhtml_multiframe1.png
diff --git a/...expected_composerhtml_multiframe1/precise/expected_composerhtml_multiframe1.png b/...expected_composerhtml_multiframe1/precise/expected_composerhtml_multiframe1.png
diff --git a/...me2/expected_composerhtml_multiframe2.png → ...ult/expected_composerhtml_multiframe2.png b/...me2/expected_composerhtml_multiframe2.png → ...ult/expected_composerhtml_multiframe2.png