Skip to content
Permalink
Browse files

Fix some failing tests

  • Loading branch information
nyalldawson committed May 6, 2014
1 parent b9f5477 commit 6cf3003e6739132ef1e3b3968384c7326e086459
@@ -116,6 +116,7 @@ void TestQgsAtlasComposition::initTestCase()

mAtlas = &mComposition->atlasComposition();
mAtlas->setCoverageLayer( mVectorLayer );
mAtlas->setEnabled( true );
mComposition->setAtlasMode( QgsComposition::ExportAtlas );

// an overview
@@ -217,7 +217,7 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
QgsRenderChecker myChecker;
myChecker.setControlName( "expected_" + theTestType );
myChecker.setMapSettings( mMapSettings );
bool myResultFlag = myChecker.runTest( theTestType );
bool myResultFlag = myChecker.runTest( theTestType, 1500 );
mReport += myChecker.report();
return myResultFlag;
}
@@ -128,7 +128,7 @@ void TestQgsComposerPaper::markerLinePaper()
{
mComposition->setPageStyleSymbol( mMarkerLineSymbol );
QgsCompositionChecker checker( "composerpaper_markerborder", mComposition );
QVERIFY( checker.testComposition( mReport ) );
QVERIFY( checker.testComposition( mReport, 0, 60 ) );
}

QTEST_MAIN( TestQgsComposerPaper )
@@ -63,6 +63,7 @@ def testCase(self):
# the atlas
self.mAtlas = self.mComposition.atlasComposition()
self.mAtlas.setCoverageLayer( mVectorLayer )
self.mAtlas.setEnabled( True )
self.mComposition.setAtlasMode( QgsComposition.ExportAtlas )

# an overview
@@ -116,7 +116,7 @@ def testVectorBlending(self):
checker.setControlName("expected_vector_blendmodes")
checker.setMapSettings(self.mapSettings)

myResult = checker.runTest("vector_blendmodes");
myResult = checker.runTest("vector_blendmodes", 1500);
myMessage = ('vector blending failed')
assert myResult, myMessage

@@ -141,7 +141,7 @@ def testVectorFeatureBlending(self):
checker.setControlName("expected_vector_featureblendmodes")
checker.setMapSettings(self.mapSettings)

myResult = checker.runTest("vector_featureblendmodes");
myResult = checker.runTest("vector_featureblendmodes", 1500);
myMessage = ('vector feature blending failed')
assert myResult, myMessage

@@ -165,7 +165,7 @@ def testVectorLayerTransparency(self):
checker.setControlName("expected_vector_layertransparency")
checker.setMapSettings(self.mapSettings)

myResult = checker.runTest("vector_layertransparency");
myResult = checker.runTest("vector_layertransparency", 1500);
myMessage = ('vector layer transparency failed')
assert myResult, myMessage

@@ -184,7 +184,7 @@ def testRasterBlending(self):
checker.setControlName("expected_raster_blendmodes")
checker.setMapSettings(self.mapSettings)

myResult = checker.runTest("raster_blendmodes");
myResult = checker.runTest("raster_blendmodes", 1500);
myMessage = ('raster blending failed')
assert myResult, myMessage

0 comments on commit 6cf3003

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