Use a non-transparent background for composition checker

Fix composerhtml tests on precise
qgis · Nov 14, 2014 · 2cfcca1 · 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
diff --git a/...expected_composerhtml_multiframe2/precise/expected_composerhtml_multiframe2.png b/...expected_composerhtml_multiframe2/precise/expected_composerhtml_multiframe2.png
diff --git a/...s1/expected_composerhtml_smartbreaks1.png → ...lt/expected_composerhtml_smartbreaks1.png b/...s1/expected_composerhtml_smartbreaks1.png → ...lt/expected_composerhtml_smartbreaks1.png
diff --git a/...pected_composerhtml_smartbreaks1/precise/expected_composerhtml_smartbreaks1.png b/...pected_composerhtml_smartbreaks1/precise/expected_composerhtml_smartbreaks1.png
diff --git a/...s2/expected_composerhtml_smartbreaks2.png → ...lt/expected_composerhtml_smartbreaks2.png b/...s2/expected_composerhtml_smartbreaks2.png → ...lt/expected_composerhtml_smartbreaks2.png
diff --git a/...pected_composerhtml_smartbreaks2/precise/expected_composerhtml_smartbreaks2.png b/...pected_composerhtml_smartbreaks2/precise/expected_composerhtml_smartbreaks2.png
diff --git a/...tml_table/expected_composerhtml_table.png → ...e/default/expected_composerhtml_table.png b/...tml_table/expected_composerhtml_table.png → ...e/default/expected_composerhtml_table.png
diff --git a/...trol_images/expected_composerhtml_table/precise/expected_composerhtml_table.png b/...trol_images/expected_composerhtml_table/precise/expected_composerhtml_table.png
diff --git a/...s/expected_composerhtml_userstylesheet/expected_composerhtml_userstylesheet.png b/...s/expected_composerhtml_userstylesheet/expected_composerhtml_userstylesheet.png
diff --git a/...ontrol_images/expected_composermap_crossgrid/expected_composermap_crossgrid.png b/...ontrol_images/expected_composermap_crossgrid/expected_composermap_crossgrid.png
diff --git a/...mages/expected_composermap_exteriorticks/expected_composermap_exteriorticks.png b/...mages/expected_composermap_exteriorticks/expected_composermap_exteriorticks.png
diff --git a/...sermap_exteriorticks_annotated/expected_composermap_exteriorticks_annotated.png b/...sermap_exteriorticks_annotated/expected_composermap_exteriorticks_annotated.png
diff --git a/...rmap_exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2.png b/...rmap_exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2.png
diff --git a/...ed_composermap_filteredannotations/expected_composermap_filteredannotations.png b/...ed_composermap_filteredannotations/expected_composermap_filteredannotations.png
diff --git a/...ges/expected_composermap_framedivisions/expected_composermap_framedivisions.png b/...ges/expected_composermap_framedivisions/expected_composermap_framedivisions.png
diff --git a/...testdata/control_images/expected_composermap_grid/expected_composermap_grid.png b/...testdata/control_images/expected_composermap_grid/expected_composermap_grid.png
diff --git a/...mages/expected_composermap_gridframeonly/expected_composermap_gridframeonly.png b/...mages/expected_composermap_gridframeonly/expected_composermap_gridframeonly.png
diff --git a/...s/expected_composermap_gridreprojected/expected_composermap_gridreprojected.png b/...s/expected_composermap_gridreprojected/expected_composermap_gridreprojected.png
diff --git a/...omposermap_interiorexteriorticks/expected_composermap_interiorexteriorticks.png b/...omposermap_interiorexteriorticks/expected_composermap_interiorexteriorticks.png
diff --git a/...xteriorticks_annotated/expected_composermap_interiorexteriorticks_annotated.png b/...xteriorticks_annotated/expected_composermap_interiorexteriorticks_annotated.png
diff --git a/...eriorticks_annotated2/expected_composermap_interiorexteriorticks_annotated2.png b/...eriorticks_annotated2/expected_composermap_interiorexteriorticks_annotated2.png
diff --git a/...mages/expected_composermap_interiorticks/expected_composermap_interiorticks.png b/...mages/expected_composermap_interiorticks/expected_composermap_interiorticks.png
diff --git a/...sermap_interiorticks_annotated/expected_composermap_interiorticks_annotated.png b/...sermap_interiorticks_annotated/expected_composermap_interiorticks_annotated.png
diff --git a/...rmap_interiorticks_annotated2/expected_composermap_interiorticks_annotated2.png b/...rmap_interiorticks_annotated2/expected_composermap_interiorticks_annotated2.png
diff --git a/...trol_images/expected_composermap_lineborder/expected_composermap_lineborder.png b/...trol_images/expected_composermap_lineborder/expected_composermap_lineborder.png
diff --git a/..._composermap_lineborder_annotated/expected_composermap_lineborder_annotated.png b/..._composermap_lineborder_annotated/expected_composermap_lineborder_annotated.png
diff --git a/...omposermap_lineborder_annotated2/expected_composermap_lineborder_annotated2.png b/...omposermap_lineborder_annotated2/expected_composermap_lineborder_annotated2.png
diff --git a/...trol_images/expected_composermap_markergrid/expected_composermap_markergrid.png b/...trol_images/expected_composermap_markergrid/expected_composermap_markergrid.png
diff --git a/.../control_images/expected_composermap_overview/expected_composermap_overview.png b/.../control_images/expected_composermap_overview/expected_composermap_overview.png
diff --git a/...pected_composermap_overview_blending/expected_composermap_overview_blending.png b/...pected_composermap_overview_blending/expected_composermap_overview_blending.png
diff --git a/...s/expected_composermap_overview_center/expected_composermap_overview_center.png b/...s/expected_composermap_overview_center/expected_composermap_overview_center.png
diff --git a/...s/expected_composermap_overview_invert/expected_composermap_overview_invert.png b/...s/expected_composermap_overview_invert/expected_composermap_overview_invert.png
diff --git a/...expected_composermap_overview_rotated/expected_composermap_overview_rotated.png b/...expected_composermap_overview_rotated/expected_composermap_overview_rotated.png
diff --git a/...pected_composermap_overview_rotated2/expected_composermap_overview_rotated2.png b/...pected_composermap_overview_rotated2/expected_composermap_overview_rotated2.png
diff --git a/...data/control_images/expected_composermap_render/expected_composermap_render.png b/...data/control_images/expected_composermap_render/expected_composermap_render.png
diff --git a/...cted_composermap_rotatedannotations/expected_composermap_rotatedannotations.png b/...cted_composermap_rotatedannotations/expected_composermap_rotatedannotations.png
diff --git a/..._images/expected_composermap_rotatedframe/expected_composermap_rotatedframe.png b/..._images/expected_composermap_rotatedframe/expected_composermap_rotatedframe.png
diff --git a/...ap_verticaldescending_inside/expected_composermap_verticaldescending_inside.png b/...ap_verticaldescending_inside/expected_composermap_verticaldescending_inside.png
diff --git a/..._verticaldescending_outside/expected_composermap_verticaldescending_outside.png b/..._verticaldescending_outside/expected_composermap_verticaldescending_outside.png
diff --git a/...trol_images/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png b/...trol_images/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png
diff --git a/...s/expected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left.png b/...s/expected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left.png
diff --git a/...cted_composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop.png b/...cted_composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop.png
diff --git a/...sermap_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright.png b/...sermap_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright.png
diff --git a/...trol_images/expected_composerpaper_bordered/expected_composerpaper_bordered.png b/...trol_images/expected_composerpaper_bordered/expected_composerpaper_bordered.png
diff --git a/...ontrol_images/expected_composerpaper_default/expected_composerpaper_default.png b/...ontrol_images/expected_composerpaper_default/expected_composerpaper_default.png
diff --git a/...ges/expected_composerpaper_markerborder/expected_composerpaper_markerborder.png b/...ges/expected_composerpaper_markerborder/expected_composerpaper_markerborder.png
diff --git a/...mages/expected_composerpaper_transparent/expected_composerpaper_transparent.png b/...mages/expected_composerpaper_transparent/expected_composerpaper_transparent.png
diff --git a/...pected_composerpicture_badexpression/expected_composerpicture_badexpression.png b/...pected_composerpicture_badexpression/expected_composerpicture_badexpression.png
diff --git a/...s/expected_composerpicture_clip_anchor/expected_composerpicture_clip_anchor.png b/...s/expected_composerpicture_clip_anchor/expected_composerpicture_clip_anchor.png
diff --git a/...serpicture_clip_anchoroversize/expected_composerpicture_clip_anchoroversize.png b/...serpicture_clip_anchoroversize/expected_composerpicture_clip_anchoroversize.png
diff --git a/...ges/expected_composerpicture_expression/expected_composerpicture_expression.png b/...ges/expected_composerpicture_expression/expected_composerpicture_expression.png
diff --git a/...expected_composerpicture_itemrotation/expected_composerpicture_itemrotation.png b/...expected_composerpicture_itemrotation/expected_composerpicture_itemrotation.png
diff --git a/...trol_images/expected_composerpicture_remote/expected_composerpicture_remote.png b/...trol_images/expected_composerpicture_remote/expected_composerpicture_remote.png
diff --git a/...s/expected_composerpicture_resize_clip/expected_composerpicture_resize_clip.png b/...s/expected_composerpicture_resize_clip/expected_composerpicture_resize_clip.png
diff --git a/...serpicture_resize_frametoimage/expected_composerpicture_resize_frametoimage.png b/...serpicture_resize_frametoimage/expected_composerpicture_resize_frametoimage.png
diff --git a/...cted_composerpicture_resize_stretch/expected_composerpicture_resize_stretch.png b/...cted_composerpicture_resize_stretch/expected_composerpicture_resize_stretch.png
diff --git a/...s/expected_composerpicture_resize_zoom/expected_composerpicture_resize_zoom.png b/...s/expected_composerpicture_resize_zoom/expected_composerpicture_resize_zoom.png
diff --git a/...omposerpicture_resize_zoomresize/expected_composerpicture_resize_zoomresize.png b/...omposerpicture_resize_zoomresize/expected_composerpicture_resize_zoomresize.png
diff --git a/..._images/expected_composerpicture_rotation/expected_composerpicture_rotation.png b/..._images/expected_composerpicture_rotation/expected_composerpicture_rotation.png
diff --git a/..._composerpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage.png b/..._composerpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage.png
diff --git a/...s/expected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch.png b/...s/expected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch.png
diff --git a/..._images/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom.png b/..._images/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom.png
diff --git a/...cted_composerpicture_svg_zoomresize/expected_composerpicture_svg_zoomresize.png b/...cted_composerpicture_svg_zoomresize/expected_composerpicture_svg_zoomresize.png
diff --git a/...s/expected_composerpicture_zoom_anchor/expected_composerpicture_zoom_anchor.png b/...s/expected_composerpicture_zoom_anchor/expected_composerpicture_zoom_anchor.png
diff --git a/...trol_images/expected_composerrotation_label/expected_composerrotation_label.png b/...trol_images/expected_composerrotation_label/expected_composerrotation_label.png
diff --git a/..._composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation.png b/..._composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation.png
diff --git a/...expected_composerrotation_maprotation/expected_composerrotation_maprotation.png b/...expected_composerrotation_maprotation/expected_composerrotation_maprotation.png
diff --git a/...trol_images/expected_composerrotation_shape/expected_composerrotation_shape.png b/...trol_images/expected_composerrotation_shape/expected_composerrotation_shape.png
diff --git a/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png b/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png
diff --git a/..._images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png b/..._images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png
diff --git a/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png b/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png
diff --git a/..._composerscalebar_singlebox_alpha/expected_composerscalebar_singlebox_alpha.png b/..._composerscalebar_singlebox_alpha/expected_composerscalebar_singlebox_alpha.png
diff --git a/...ontrol_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png b/...ontrol_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png
diff --git a/...trol_images/expected_composershapes_ellipse/expected_composershapes_ellipse.png b/...trol_images/expected_composershapes_ellipse/expected_composershapes_ellipse.png
diff --git a/..._images/expected_composershapes_rectangle/expected_composershapes_rectangle.png b/..._images/expected_composershapes_rectangle/expected_composershapes_rectangle.png
diff --git a/...ges/expected_composershapes_roundedrect/expected_composershapes_roundedrect.png b/...ges/expected_composershapes_roundedrect/expected_composershapes_roundedrect.png
diff --git a/...ol_images/expected_composershapes_symbolv2/expected_composershapes_symbolv2.png b/...ol_images/expected_composershapes_symbolv2/expected_composershapes_symbolv2.png
diff --git a/...ol_images/expected_composershapes_triangle/expected_composershapes_triangle.png b/...ol_images/expected_composershapes_triangle/expected_composershapes_triangle.png
diff --git a/tests/testdata/control_images/expected_piediagram/expected_piediagram.png b/tests/testdata/control_images/expected_piediagram/expected_piediagram.png
diff --git a/...ontrol_images/expected_piediagram_expression/expected_piediagram_expression.png b/...ontrol_images/expected_piediagram_expression/expected_piediagram_expression.png