Skip to content
Permalink
Browse files

[tests] Fix failing diagram and blend modes tests

  • Loading branch information
nyalldawson committed Dec 28, 2013
1 parent cfd9a66 commit ac637699377e70899766bba20bf0a4f499d7c05e
@@ -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 );

@@ -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 );
}
Binary file not shown.
Binary file not shown.

0 comments on commit ac63769

Please sign in to comment.
You can’t perform that action at this time.