qgis · Nov 14, 2014
diff --git a/‎tests/src/core/testqgsshapeburst.cpp
Lines changed: 4 additions & 3 deletions b/‎tests/src/core/testqgsshapeburst.cpp
Lines changed: 4 additions & 3 deletions
diff --git a/‎tests/testdata/control_images/expected_shapeburst/expected_shapeburst.png renamed to ‎tests/testdata/control_images/expected_shapeburst/default/expected_shapeburst.png b/‎tests/testdata/control_images/expected_shapeburst/expected_shapeburst.png renamed to ‎tests/testdata/control_images/expected_shapeburst/default/expected_shapeburst.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst/precise/expected_shapeburst.png
36.2 KB b/‎tests/testdata/control_images/expected_shapeburst/precise/expected_shapeburst.png
36.2 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_blur/expected_shapeburst_blur.png renamed to ‎tests/testdata/control_images/expected_shapeburst_blur/default/expected_shapeburst_blur.png b/‎tests/testdata/control_images/expected_shapeburst_blur/expected_shapeburst_blur.png renamed to ‎tests/testdata/control_images/expected_shapeburst_blur/default/expected_shapeburst_blur.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_blur/precise/expected_shapeburst_blur.png
36.9 KB b/‎tests/testdata/control_images/expected_shapeburst_blur/precise/expected_shapeburst_blur.png
36.9 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_colors/expected_shapeburst_colors.png renamed to ‎tests/testdata/control_images/expected_shapeburst_colors/default/expected_shapeburst_colors.png b/‎tests/testdata/control_images/expected_shapeburst_colors/expected_shapeburst_colors.png renamed to ‎tests/testdata/control_images/expected_shapeburst_colors/default/expected_shapeburst_colors.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_colors/precise/expected_shapeburst_colors.png
39.5 KB b/‎tests/testdata/control_images/expected_shapeburst_colors/precise/expected_shapeburst_colors.png
39.5 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_from_qml/precise/expected_shapeburst_from_qml.png
47.7 KB b/‎tests/testdata/control_images/expected_shapeburst_from_qml/precise/expected_shapeburst_from_qml.png
47.7 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_ignorerings/expected_shapeburst_ignorerings.png renamed to ‎tests/testdata/control_images/expected_shapeburst_ignorerings/default/expected_shapeburst_ignorerings.png b/‎tests/testdata/control_images/expected_shapeburst_ignorerings/expected_shapeburst_ignorerings.png renamed to ‎tests/testdata/control_images/expected_shapeburst_ignorerings/default/expected_shapeburst_ignorerings.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_ignorerings/precise/expected_shapeburst_ignorerings.png
26.9 KB b/‎tests/testdata/control_images/expected_shapeburst_ignorerings/precise/expected_shapeburst_ignorerings.png
26.9 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_ignorerings/precise2/expected_shapeburst_ignorerings.png
36.2 KB b/‎tests/testdata/control_images/expected_shapeburst_ignorerings/precise2/expected_shapeburst_ignorerings.png
36.2 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/expected_shapeburst_maxdistance_mapunit.png renamed to ‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/default/expected_shapeburst_maxdistance_mapunit.png b/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/expected_shapeburst_maxdistance_mapunit.png renamed to ‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/default/expected_shapeburst_maxdistance_mapunit.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/precise/expected_shapeburst_maxdistance_mapunit.png
26.8 KB b/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mapunit/precise/expected_shapeburst_maxdistance_mapunit.png
26.8 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/expected_shapeburst_maxdistance_mm.png renamed to ‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/default/expected_shapeburst_maxdistance_mm.png b/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/expected_shapeburst_maxdistance_mm.png renamed to ‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/default/expected_shapeburst_maxdistance_mm.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/precise/expected_shapeburst_maxdistance_mm.png
31.5 KB b/‎tests/testdata/control_images/expected_shapeburst_maxdistance_mm/precise/expected_shapeburst_maxdistance_mm.png
31.5 KB
diff --git a/‎tests/testdata/control_images/expected_shapeburst_ramp/expected_shapeburst_ramp.png renamed to ‎tests/testdata/control_images/expected_shapeburst_ramp/default/expected_shapeburst_ramp.png b/‎tests/testdata/control_images/expected_shapeburst_ramp/expected_shapeburst_ramp.png renamed to ‎tests/testdata/control_images/expected_shapeburst_ramp/default/expected_shapeburst_ramp.png
diff --git a/‎tests/testdata/control_images/expected_shapeburst_ramp/precise/expected_shapeburst_ramp.png
43.5 KB b/‎tests/testdata/control_images/expected_shapeburst_ramp/precise/expected_shapeburst_ramp.png
43.5 KB
@@ -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;
 }