From f3d5e0b270da517db6f4d9c6d8034d5ca030e4e8 Mon Sep 17 00:00:00 2001 From: nyalldawson Date: Sun, 29 Dec 2013 08:50:00 +1100 Subject: [PATCH] [tests] Update composer effect tests --- tests/src/core/testqgscomposereffects.cpp | 21 +++++++++++++----- .../expected_composereffects_blend.png} | Bin ...expected_composereffects_transparency.png} | Bin 3 files changed, 15 insertions(+), 6 deletions(-) rename tests/testdata/control_images/{expected_composereffects/composereffect_blend.png => expected_composereffects_blend/expected_composereffects_blend.png} (100%) rename tests/testdata/control_images/{expected_composereffects/composereffect_transparency.png => expected_composereffects_transparency/expected_composereffects_transparency.png} (100%) diff --git a/tests/src/core/testqgscomposereffects.cpp b/tests/src/core/testqgscomposereffects.cpp index 7b152fce485..7af1c26394d 100644 --- a/tests/src/core/testqgscomposereffects.cpp +++ b/tests/src/core/testqgscomposereffects.cpp @@ -41,6 +41,7 @@ class TestQgsComposerEffects: public QObject QgsComposerShape* mComposerRect1; QgsComposerShape* mComposerRect2; QgsMapRenderer* mMapRenderer; + QString mReport; }; void TestQgsComposerEffects::initTestCase() @@ -62,11 +63,21 @@ void TestQgsComposerEffects::initTestCase() mComposerRect2->setShapeType( QgsComposerShape::Rectangle ); mComposition->addComposerShape( mComposerRect2 ); + mReport = "

Composer Effects Tests

\n"; } void TestQgsComposerEffects::cleanupTestCase() { delete mComposition; + + QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html"; + QFile myFile( myReportFile ); + if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) ) + { + QTextStream myQTextStream( &myFile ); + myQTextStream << mReport; + myFile.close(); + } } void TestQgsComposerEffects::init() @@ -83,9 +94,8 @@ void TestQgsComposerEffects::blend_modes() { mComposerRect2->setBlendMode( QPainter::CompositionMode_Multiply ); - QgsCompositionChecker checker( "Composer effects blending", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + - "control_images" + QDir::separator() + "expected_composereffects" + QDir::separator() + "composereffect_blend.png" ) ); - QVERIFY( checker.testComposition() ); + QgsCompositionChecker checker( "composereffects_blend", mComposition ); + QVERIFY( checker.testComposition( mReport) ); // reset blending mComposerRect2->setBlendMode( QPainter::CompositionMode_SourceOver ); } @@ -94,9 +104,8 @@ void TestQgsComposerEffects::transparency() { mComposerRect2->setTransparency( 50 ); - QgsCompositionChecker checker( "Composer item transparency", mComposition, QString( QString( TEST_DATA_DIR ) + QDir::separator() + - "control_images" + QDir::separator() + "expected_composereffects" + QDir::separator() + "composereffect_transparency.png" ) ); - QVERIFY( checker.testComposition() ); + QgsCompositionChecker checker( "composereffects_transparency", mComposition ); + QVERIFY( checker.testComposition( mReport ) ); } QTEST_MAIN( TestQgsComposerEffects ) diff --git a/tests/testdata/control_images/expected_composereffects/composereffect_blend.png b/tests/testdata/control_images/expected_composereffects_blend/expected_composereffects_blend.png similarity index 100% rename from tests/testdata/control_images/expected_composereffects/composereffect_blend.png rename to tests/testdata/control_images/expected_composereffects_blend/expected_composereffects_blend.png diff --git a/tests/testdata/control_images/expected_composereffects/composereffect_transparency.png b/tests/testdata/control_images/expected_composereffects_transparency/expected_composereffects_transparency.png similarity index 100% rename from tests/testdata/control_images/expected_composereffects/composereffect_transparency.png rename to tests/testdata/control_images/expected_composereffects_transparency/expected_composereffects_transparency.png