[tests] Fix failing diagram and blend modes tests

qgis · Dec 28, 2013 · ac63769 · ac63769
1 parent cfd9a66
commit ac63769
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
@@ -52,7 +52,7 @@ class TestQgsBlendModes: public QObject
     bool imageCheck( QString theType ); //as above
     QgsMapRenderer * mpMapRenderer;
     QgsMapLayer * mpPointsLayer;
-    QgsMapLayer * mpPolysLayer;
+    QgsVectorLayer * mpPolysLayer;
     QgsVectorLayer * mpLinesLayer;
     QgsRasterLayer* mRasterLayer1;
     QgsRasterLayer* mRasterLayer2;
@@ -85,6 +85,7 @@ void TestQgsBlendModes::initTestCase()
   QFileInfo myPolyFileInfo( myPolysFileName );
   mpPolysLayer = new QgsVectorLayer( myPolyFileInfo.filePath(),
                                      myPolyFileInfo.completeBaseName(), "ogr" );
+  mpPolysLayer->setSimplifyDrawingHints( QgsVectorLayer::NoSimplification );
   QgsMapLayerRegistry::instance()->addMapLayers(
     QList<QgsMapLayer *>() << mpPolysLayer );
 
@@ -93,6 +94,7 @@ void TestQgsBlendModes::initTestCase()
   QFileInfo myLineFileInfo( myLinesFileName );
   mpLinesLayer = new QgsVectorLayer( myLineFileInfo.filePath(),
                                      myLineFileInfo.completeBaseName(), "ogr" );
+  mpLinesLayer->setSimplifyDrawingHints( QgsVectorLayer::NoSimplification );
   QgsMapLayerRegistry::instance()->addMapLayers(
     QList<QgsMapLayer *>() << mpLinesLayer );
 

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -166,11 +166,9 @@ class TestQgsDiagram: public QObject
       mPointsLayer->setDiagramLayerSettings( dls );
 
       mComposerMap->setNewExtent( QgsRectangle( -122, -79, -70, 47 ) );
-      QgsCompositionChecker checker( "Composer map render", mComposition, QString( QString( TEST_DATA_DIR )
-                                     + QDir::separator() + "control_images" + QDir::separator() + "expected_diagram" + QDir::separator()
-                                     + "expected_piediagram.png" ) );
+      QgsCompositionChecker checker( "piediagram", mComposition );
 
-      QVERIFY( checker.testComposition() );
+      QVERIFY( checker.testComposition( mReport ) );
 
       mPointsLayer->setDiagramRenderer( 0 );
     }

diff --git a/tests/testdata/control_images/expected_diagram/expected_piediagram.png b/tests/testdata/control_images/expected_diagram/expected_piediagram.png
diff --git a/tests/testdata/control_images/expected_piediagram/expected_piediagram.png b/tests/testdata/control_images/expected_piediagram/expected_piediagram.png