Fix shapeburst test

Move to multirenderchecker
qgis · Nov 14, 2014 · 81d3871 · 81d3871
1 parent 416f471
commit 81d3871
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 3 deletions.
diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp
@@ -35,7 +35,7 @@
 #include <qgsfillsymbollayerv2.h>
 #include <qgsvectorcolorrampv2.h>
 //qgis test includes
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 
 /** \ingroup UnitTests
  * This is a unit test for shapeburst fill types.
@@ -233,10 +233,11 @@ bool TestQgsShapeburst::imageCheck( QString theTestType )
   //use the QgsRenderChecker test utility class to
   //ensure the rendered output matches our control image
   mMapSettings.setExtent( mpPolysLayer->extent() );
-  QgsRenderChecker myChecker;
+  QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );
-  bool myResultFlag = myChecker.runTest( theTestType, 200 );
+  myChecker.setColorTolerance( 20 );
+  bool myResultFlag = myChecker.runTest( theTestType );
   mReport += myChecker.report();
   return myResultFlag;
 }

diff --git a/...pected_shapeburst/expected_shapeburst.png → ...hapeburst/default/expected_shapeburst.png b/...pected_shapeburst/expected_shapeburst.png → ...hapeburst/default/expected_shapeburst.png
diff --git a/tests/testdata/control_images/expected_shapeburst/precise/expected_shapeburst.png b/tests/testdata/control_images/expected_shapeburst/precise/expected_shapeburst.png
diff --git a/...peburst_blur/expected_shapeburst_blur.png → ...blur/default/expected_shapeburst_blur.png b/...peburst_blur/expected_shapeburst_blur.png → ...blur/default/expected_shapeburst_blur.png
diff --git a/...ta/control_images/expected_shapeburst_blur/precise/expected_shapeburst_blur.png b/...ta/control_images/expected_shapeburst_blur/precise/expected_shapeburst_blur.png
diff --git a/...rst_colors/expected_shapeburst_colors.png → ...rs/default/expected_shapeburst_colors.png b/...rst_colors/expected_shapeburst_colors.png → ...rs/default/expected_shapeburst_colors.png
diff --git a/...ontrol_images/expected_shapeburst_colors/precise/expected_shapeburst_colors.png b/...ontrol_images/expected_shapeburst_colors/precise/expected_shapeburst_colors.png
diff --git a/...ol_images/expected_shapeburst_from_qml/precise/expected_shapeburst_from_qml.png b/...ol_images/expected_shapeburst_from_qml/precise/expected_shapeburst_from_qml.png
diff --git a/...rings/expected_shapeburst_ignorerings.png → ...fault/expected_shapeburst_ignorerings.png b/...rings/expected_shapeburst_ignorerings.png → ...fault/expected_shapeburst_ignorerings.png
diff --git a/...ges/expected_shapeburst_ignorerings/precise/expected_shapeburst_ignorerings.png b/...ges/expected_shapeburst_ignorerings/precise/expected_shapeburst_ignorerings.png
diff --git a/...es/expected_shapeburst_ignorerings/precise2/expected_shapeburst_ignorerings.png b/...es/expected_shapeburst_ignorerings/precise2/expected_shapeburst_ignorerings.png
diff --git a/...pected_shapeburst_maxdistance_mapunit.png → ...pected_shapeburst_maxdistance_mapunit.png b/...pected_shapeburst_maxdistance_mapunit.png → ...pected_shapeburst_maxdistance_mapunit.png
diff --git a/...peburst_maxdistance_mapunit/precise/expected_shapeburst_maxdistance_mapunit.png b/...peburst_maxdistance_mapunit/precise/expected_shapeburst_maxdistance_mapunit.png
diff --git a/...mm/expected_shapeburst_maxdistance_mm.png → ...lt/expected_shapeburst_maxdistance_mm.png b/...mm/expected_shapeburst_maxdistance_mm.png → ...lt/expected_shapeburst_maxdistance_mm.png
diff --git a/...pected_shapeburst_maxdistance_mm/precise/expected_shapeburst_maxdistance_mm.png b/...pected_shapeburst_maxdistance_mm/precise/expected_shapeburst_maxdistance_mm.png
diff --git a/...peburst_ramp/expected_shapeburst_ramp.png → ...ramp/default/expected_shapeburst_ramp.png b/...peburst_ramp/expected_shapeburst_ramp.png → ...ramp/default/expected_shapeburst_ramp.png
diff --git a/...ta/control_images/expected_shapeburst_ramp/precise/expected_shapeburst_ramp.png b/...ta/control_images/expected_shapeburst_ramp/precise/expected_shapeburst_ramp.png