Add some test images and tweak test tolerances for utopic

qgis · Nov 29, 2014 · d532af0 · d532af0
1 parent 20f57c9
commit d532af0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
@@ -220,7 +220,7 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );
   myChecker.setColorTolerance( 1 );
-  bool myResultFlag = myChecker.runTest( theTestType );
+  bool myResultFlag = myChecker.runTest( theTestType, 20 );
   mReport += myChecker.report();
   return myResultFlag;
 }

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -420,7 +420,7 @@ void TestQgsGeometry::bufferCheck()
   QVERIFY( myPolygon.size() > 0 ); //check that the buffer created a feature
   dumpPolygon( myPolygon );
   delete mypBufferGeometry;
-  QVERIFY( renderCheck( "geometry_bufferCheck", "Checking buffer(10,10) of B" ) );
+  QVERIFY( renderCheck( "geometry_bufferCheck", "Checking buffer(10,10) of B", 10 ) );
 }
 bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment , int mismatchCount )
 {

diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp
@@ -176,7 +176,7 @@ bool TestQgsInvertedPolygon::imageCheck( QString theTestType, const QgsRectangle
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );
   myChecker.setColorTolerance( 20 );
-  bool myResultFlag = myChecker.runTest( theTestType );
+  bool myResultFlag = myChecker.runTest( theTestType, 100 );
   mReport += myChecker.report();
   return myResultFlag;
 }

diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
@@ -31,7 +31,7 @@
 #include <qgsproviderregistry.h>
 #include <qgsmaplayerregistry.h>
 //qgis test includes
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 
 /** \ingroup UnitTests
  * This is a unit test for the different renderers for vector layers.
@@ -213,7 +213,7 @@ bool TestQgsRenderers::imageCheck( QString theTestType )
   QgsRectangle extent( -118.8888888888887720, 22.8002070393376783, -83.3333333333331581, 46.8719806763287536 );
   mMapSettings.setExtent( extent );
   mMapSettings.setFlag( QgsMapSettings::ForceVectorOutput );
-  QgsRenderChecker myChecker;
+  QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );
   myChecker.setColorTolerance( 15 );

diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py
@@ -117,7 +117,7 @@ def testVectorBlending(self):
         checker.setMapSettings(self.mapSettings)
         checker.setColorTolerance( 1 )
 
-        myResult = checker.runTest("vector_blendmodes", 1500);
+        myResult = checker.runTest("vector_blendmodes", 20);
         myMessage = ('vector blending failed')
         assert myResult, myMessage
 
@@ -143,7 +143,7 @@ def testVectorFeatureBlending(self):
         checker.setMapSettings(self.mapSettings)
         checker.setColorTolerance( 1 )
 
-        myResult = checker.runTest("vector_featureblendmodes", 1500);
+        myResult = checker.runTest("vector_featureblendmodes", 20);
         myMessage = ('vector feature blending failed')
         assert myResult, myMessage
 
@@ -168,7 +168,7 @@ def testVectorLayerTransparency(self):
         checker.setMapSettings(self.mapSettings)
         checker.setColorTolerance( 1 )
 
-        myResult = checker.runTest("vector_layertransparency", 1500);
+        myResult = checker.runTest("vector_layertransparency", 20);
         myMessage = ('vector layer transparency failed')
         assert myResult, myMessage
 
@@ -189,7 +189,7 @@ def testRasterBlending(self):
         checker.setColorTolerance( 1 )
         checker.setColorTolerance( 1 )
 
-        myResult = checker.runTest("raster_blendmodes", 1500);
+        myResult = checker.runTest("raster_blendmodes", 20);
         myMessage = ('raster blending failed')
         assert myResult, myMessage
 

diff --git a/...mages/expected_single/expected_single.png → ...pected_single/default/expected_single.png b/...mages/expected_single/expected_single.png → ...pected_single/default/expected_single.png
diff --git a/tests/testdata/control_images/expected_single/utopic/expected_single.png b/tests/testdata/control_images/expected_single/utopic/expected_single.png