Explicitly set dpi for test images, should help tests pass on OSX

qgis · Jun 23, 2015 · c855e98 · c855e98
1 parent f29b55a
commit c855e98
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 2 deletions.
diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
@@ -226,6 +226,7 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
 {
   //use the QgsRenderChecker test utility class to
   //ensure the rendered output matches our control image
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -217,6 +217,7 @@ bool TestQgsDiagram::imageCheck( QString theTestType )
   QgsRectangle extent( -126, 23, -70, 47 );
   mMapSettings.setExtent( extent );
   mMapSettings.setFlag( QgsMapSettings::ForceVectorOutput );
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp
@@ -182,6 +182,7 @@ bool TestQgsInvertedPolygon::imageCheck( QString theTestType, const QgsRectangle
   {
     mMapSettings.setExtent( *extent );
   }
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsmaprotation.cpp b/tests/src/core/testqgsmaprotation.cpp
@@ -205,6 +205,7 @@ void TestQgsMapRotation::linesLayer()
 bool TestQgsMapRotation::render( QString theTestType )
 {
   mReport += "<h2>" + theTestType + "</h2>\n";
+  mMapSettings.setOutputDpi( 96 );
   QgsRenderChecker checker;
   checker.setControlPathPrefix( "maprotation" );
   checker.setControlName( "expected_" + theTestType );

diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp
@@ -919,6 +919,7 @@ bool TestQgsPaintEffect::imageCheck( QString testName, QImage &image, int mismat
 bool TestQgsPaintEffect::mapRenderCheck( QString testName, QgsMapSettings& mapSettings, int mismatchCount )
 {
   QgsMultiRenderChecker checker;
+  mapSettings.setOutputDpi( 96 );
   checker.setControlName( "expected_" + testName );
   checker.setMapSettings( mapSettings );
   checker.setColorTolerance( 20 );

diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp
@@ -213,6 +213,7 @@ bool TestQgsRasterFill::imageCheck( QString theTestType )
   //use the QgsRenderChecker test utility class to
   //ensure the rendered output matches our control image
   mMapSettings.setExtent( mpPolysLayer->extent() );
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
@@ -221,6 +221,7 @@ bool TestQgsRenderers::imageCheck( QString theTestType )
   QgsRectangle extent( -118.8888888888887720, 22.8002070393376783, -83.3333333333331581, 46.8719806763287536 );
   mMapSettings.setExtent( extent );
   mMapSettings.setFlag( QgsMapSettings::ForceVectorOutput );
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp
@@ -243,6 +243,7 @@ bool TestQgsShapeburst::imageCheck( QString theTestType )
   //use the QgsRenderChecker test utility class to
   //ensure the rendered output matches our control image
   mMapSettings.setExtent( mpPolysLayer->extent() );
+  mMapSettings.setOutputDpi( 96 );
   QgsMultiRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestType );
   myChecker.setMapSettings( mMapSettings );

diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp
@@ -176,6 +176,7 @@ void TestStyleV2::cleanupTestCase()
 bool TestStyleV2::imageCheck( QgsMapSettings& ms, const QString& testName )
 {
   QgsMultiRenderChecker checker;
+  ms.setOutputDpi( 96 );
   checker.setControlName( "expected_" + testName );
   checker.setMapSettings( ms );
   bool result = checker.runTest( testName, 0 );

diff --git a/tests/src/gui/testqgsmapcanvas.cpp b/tests/src/gui/testqgsmapcanvas.cpp
@@ -72,14 +72,20 @@ void TestQgsMapCanvas::testMapRendererInteraction()
   QgsRectangle r1( 10, 10, 20, 20 );
   mr->setExtent( r1 );
   QgsRectangle r2 = mr->extent();
-  QCOMPARE( mCanvas->extent(), r2 );
+  QVERIFY( qgsDoubleNear( mCanvas->extent().xMinimum(), r2.xMinimum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mCanvas->extent().yMinimum(), r2.yMinimum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mCanvas->extent().xMaximum(), r2.xMaximum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mCanvas->extent().yMaximum(), r2.yMaximum(), 0.0000000001 ) );
   QCOMPARE( spy2.count(), 1 );
 
   QgsRectangle r3( 100, 100, 200, 200 );
   QSignalSpy spy3( mr, SIGNAL( extentsChanged() ) );
   mCanvas->setExtent( r3 );
   QgsRectangle r4 = mCanvas->extent();
-  QCOMPARE( mr->extent(), r4 );
+  QVERIFY( qgsDoubleNear( mr->extent().xMinimum(), r4.xMinimum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mr->extent().yMinimum(), r4.yMinimum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mr->extent().xMaximum(), r4.xMaximum(), 0.0000000001 ) );
+  QVERIFY( qgsDoubleNear( mr->extent().yMaximum(), r4.yMaximum(), 0.0000000001 ) );
   QCOMPARE( spy3.count(), 1 );
 
   // Destination CRS

diff --git a/tests/src/python/test_qgsblendmodes.py b/tests/src/python/test_qgsblendmodes.py
@@ -93,6 +93,7 @@ def __init__(self, methodName):
         self.mMap.resize(QSize(400, 400))
         self.mapSettings = self.mCanvas.mapSettings()
         self.mapSettings.setOutputSize(QSize(400, 400))
+        self.mapSettings.setOutputDpi( 96 )
 
     def testVectorBlending(self):
         """Test that blend modes work for vector layers."""