Skip to content

Commit

Permalink
Rebuild composer test images at 96 dpi to speed up unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Sep 21, 2014
1 parent 3766537 commit 3af68f4
Show file tree
Hide file tree
Showing 104 changed files with 66 additions and 65 deletions.
23 changes: 12 additions & 11 deletions tests/src/core/qgscompositionchecker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,26 @@ bool QgsCompositionChecker::testComposition( QString &report, int page, int pixe
return false;
}

setControlName( "expected_" + mTestName );

#if 0
//fake mode to generate expected image
//assume 300 dpi and size of the control image 3507 * 2480
QImage outputImage( QSize( 3507, 2480 ), QImage::Format_ARGB32 );
//assume 96 dpi and size of the control image 1122 * 794
QImage newImage( QSize( 1122, 794 ), QImage::Format_ARGB32 );
mComposition->setPlotStyle( QgsComposition::Print );
outputImage.setDotsPerMeterX( 300 / 25.4 * 1000 );
outputImage.setDotsPerMeterY( 300 / 25.4 * 1000 );
outputImage.fill( 0 );
QPainter p( &outputImage );
newImage.setDotsPerMeterX( 96 / 25.4 * 1000 );
newImage.setDotsPerMeterY( 96 / 25.4 * 1000 );
newImage.fill( 0 );
QPainter expectedPainter( &newImage );
//QRectF sourceArea( 0, 0, mComposition->paperWidth(), mComposition->paperHeight() );
//QRectF targetArea( 0, 0, 3507, 2480 );
mComposition->renderPage( &p, page );
p.end();
outputImage.save( "/tmp/composerhtml_table_control.png", "PNG" );
return false;
mComposition->renderPage( &expectedPainter, page );
expectedPainter.end();
newImage.save( mExpectedImageFile, "PNG" );
return true;
#endif //0

//load expected image
setControlName( "expected_" + mTestName );
QImage expectedImage( mExpectedImageFile );

//get width/height, create image and render the composition to it
Expand Down
18 changes: 9 additions & 9 deletions tests/src/core/testqgsatlascomposition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ void TestQgsAtlasComposition::autoscale_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_autoscale%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
mAtlasMap->setAtlasDriven( false );
Expand All @@ -239,7 +239,7 @@ void TestQgsAtlasComposition::autoscale_render_2_0_api()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_autoscale_old_api%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
Q_NOWARN_DEPRECATED_PUSH
Expand All @@ -263,7 +263,7 @@ void TestQgsAtlasComposition::fixedscale_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_fixedscale%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();

Expand All @@ -285,7 +285,7 @@ void TestQgsAtlasComposition::fixedscale_render_2_0_api()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_fixedscale_old_api%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
Q_NOWARN_DEPRECATED_PUSH
Expand Down Expand Up @@ -321,7 +321,7 @@ void TestQgsAtlasComposition::predefinedscales_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_predefinedscales%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();

Expand All @@ -345,7 +345,7 @@ void TestQgsAtlasComposition::two_map_autoscale_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_two_maps%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
mAtlasMap->setAtlasDriven( false );
Expand All @@ -368,7 +368,7 @@ void TestQgsAtlasComposition::hiding_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_hiding%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
}
Expand All @@ -392,7 +392,7 @@ void TestQgsAtlasComposition::sorting_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_sorting%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
}
Expand All @@ -417,7 +417,7 @@ void TestQgsAtlasComposition::filtering_render()
mLabel1->adjustSizeToText();

QgsCompositionChecker checker( QString( "atlas_filtering%1" ).arg((( int )fit ) + 1 ), mComposition );
QVERIFY( checker.testComposition( mReport, 0, 200 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}
mAtlas->endRender();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgscomposermap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void TestQgsComposerMap::render()
mComposerMap->setNewExtent( QgsRectangle( 781662.375, 3339523.125, 793062.375, 3345223.125 ) );
QgsCompositionChecker checker( "composermap_render", mComposition );

QVERIFY( checker.testComposition( mReport, 0, 100 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}

void TestQgsComposerMap::uniqueId()
Expand Down
40 changes: 20 additions & 20 deletions tests/src/core/testqgscomposermapgrid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void TestQgsComposerMapGrid::grid()
qWarning() << "grid annotation font: " << mComposerMap->grid()->annotationFont().toString() << " exactMatch:" << mComposerMap->grid()->annotationFont().exactMatch();
QgsCompositionChecker checker( "composermap_grid", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposerMap->grid()->setEnabled( false );
mComposerMap->grid()->setAnnotationEnabled( false );
QVERIFY( testResult );
Expand All @@ -139,7 +139,7 @@ void TestQgsComposerMapGrid::crossGrid()
mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
QgsCompositionChecker checker( "composermap_crossgrid", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposerMap->grid()->setStyle( QgsComposerMapGrid::Solid );
mComposerMap->grid()->setEnabled( false );
mComposerMap->grid()->setAnnotationEnabled( false );
Expand All @@ -157,7 +157,7 @@ void TestQgsComposerMapGrid::markerGrid()
mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
QgsCompositionChecker checker( "composermap_markergrid", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposerMap->grid()->setStyle( QgsComposerMapGrid::Solid );
mComposerMap->grid()->setEnabled( false );
mComposerMap->grid()->setAnnotationEnabled( false );
Expand All @@ -178,7 +178,7 @@ void TestQgsComposerMapGrid::frameOnly()
mComposerMap->grid()->setBlendMode( QPainter::CompositionMode_SourceOver );
QgsCompositionChecker checker( "composermap_gridframeonly", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposerMap->grid()->setStyle( QgsComposerMapGrid::Solid );
mComposerMap->grid()->setEnabled( false );
mComposerMap->grid()->setAnnotationEnabled( false );
Expand All @@ -203,7 +203,7 @@ void TestQgsComposerMapGrid::zebraStyle()

QgsCompositionChecker checker( "composermap_zebrastyle", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );
}

Expand All @@ -228,17 +228,17 @@ void TestQgsComposerMapGrid::zebraStyleSides()
mComposerMap->grid()->setFrameSideFlag( QgsComposerMapGrid::FrameBottom, false );

QgsCompositionChecker checker( "composermap_zebrastyle_left", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setFrameSideFlag( QgsComposerMapGrid::FrameTop, true );
QgsCompositionChecker checker2( "composermap_zebrastyle_lefttop", mComposition );
bool testResult2 = checker2.testComposition( mReport, 0, 100 );
bool testResult2 = checker2.testComposition( mReport, 0, 0 );
QVERIFY( testResult2 );

mComposerMap->grid()->setFrameSideFlag( QgsComposerMapGrid::FrameRight, true );
QgsCompositionChecker checker3( "composermap_zebrastyle_lefttopright", mComposition );
bool testResult3 = checker3.testComposition( mReport, 0, 100 );
bool testResult3 = checker3.testComposition( mReport, 0, 0 );
QVERIFY( testResult3 );

mComposerMap->grid()->setFrameSideFlag( QgsComposerMapGrid::FrameBottom, true );
Expand All @@ -258,7 +258,7 @@ void TestQgsComposerMapGrid::interiorTicks()
mComposerMap->grid()->setStyle( QgsComposerMapGrid::FrameAnnotationsOnly );

QgsCompositionChecker checker( "composermap_interiorticks", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -282,7 +282,7 @@ void TestQgsComposerMapGrid::interiorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::InsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker( "composermap_interiorticks_annotated", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Left );
Expand All @@ -291,7 +291,7 @@ void TestQgsComposerMapGrid::interiorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker2( "composermap_interiorticks_annotated2", mComposition );
bool testResult2 = checker2.testComposition( mReport, 0, 100 );
bool testResult2 = checker2.testComposition( mReport, 0, 0 );
QVERIFY( testResult2 );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -310,7 +310,7 @@ void TestQgsComposerMapGrid::exteriorTicks()
mComposerMap->grid()->setStyle( QgsComposerMapGrid::FrameAnnotationsOnly );

QgsCompositionChecker checker( "composermap_exteriorticks", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -334,7 +334,7 @@ void TestQgsComposerMapGrid::exteriorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::InsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker( "composermap_exteriorticks_annotated", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Left );
Expand All @@ -343,7 +343,7 @@ void TestQgsComposerMapGrid::exteriorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker2( "composermap_exteriorticks_annotated2", mComposition );
bool testResult2 = checker2.testComposition( mReport, 0, 100 );
bool testResult2 = checker2.testComposition( mReport, 0, 0 );
QVERIFY( testResult2 );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -362,7 +362,7 @@ void TestQgsComposerMapGrid::interiorExteriorTicks()
mComposerMap->grid()->setStyle( QgsComposerMapGrid::FrameAnnotationsOnly );

QgsCompositionChecker checker( "composermap_interiorexteriorticks", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -386,7 +386,7 @@ void TestQgsComposerMapGrid::interiorExteriorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::InsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker( "composermap_interiorexteriorticks_annotated", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Left );
Expand All @@ -395,7 +395,7 @@ void TestQgsComposerMapGrid::interiorExteriorTicksAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker2( "composermap_interiorexteriorticks_annotated2", mComposition );
bool testResult2 = checker2.testComposition( mReport, 0, 100 );
bool testResult2 = checker2.testComposition( mReport, 0, 0 );
QVERIFY( testResult2 );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -414,7 +414,7 @@ void TestQgsComposerMapGrid::lineBorder()
mComposerMap->grid()->setStyle( QgsComposerMapGrid::FrameAnnotationsOnly );

QgsCompositionChecker checker( "composermap_lineborder", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand All @@ -438,7 +438,7 @@ void TestQgsComposerMapGrid::lineBorderAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::InsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker( "composermap_lineborder_annotated", mComposition );
bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
QVERIFY( testResult );

mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Left );
Expand All @@ -447,7 +447,7 @@ void TestQgsComposerMapGrid::lineBorderAnnotated()
mComposerMap->grid()->setAnnotationPosition( QgsComposerMapGrid::OutsideMapFrame, QgsComposerMapGrid::Bottom );

QgsCompositionChecker checker2( "composermap_lineborder_annotated2", mComposition );
bool testResult2 = checker2.testComposition( mReport, 0, 100 );
bool testResult2 = checker2.testComposition( mReport, 0, 0 );
QVERIFY( testResult2 );

mComposerMap->grid()->setFrameStyle( QgsComposerMapGrid::NoFrame );
Expand Down
12 changes: 6 additions & 6 deletions tests/src/core/testqgscomposermapoverview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void TestQgsComposerMapOverview::overviewMap()
overviewMap->overview()->setFrameMap( mComposerMap->id() );
QgsCompositionChecker checker( "composermap_overview", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMap );
QVERIFY( testResult );
}
Expand All @@ -127,7 +127,7 @@ void TestQgsComposerMapOverview::overviewMapRotated()
overviewMap->overview()->setFrameMap( mComposerMap->id() );
QgsCompositionChecker checker( "composermap_overview_rotated", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMap );
mComposerMap->setMapRotation( 0 );
QVERIFY( testResult );
Expand All @@ -144,7 +144,7 @@ void TestQgsComposerMapOverview::overviewMapRotated2()
overviewMap->overview()->setFrameMap( mComposerMap->id() );
QgsCompositionChecker checker( "composermap_overview_rotated2", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMap );
QVERIFY( testResult );
}
Expand All @@ -161,7 +161,7 @@ void TestQgsComposerMapOverview::overviewMapBlending()

QgsCompositionChecker checker( "composermap_overview_blending", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMapBlend );
QVERIFY( testResult );
}
Expand All @@ -178,7 +178,7 @@ void TestQgsComposerMapOverview::overviewMapInvert()

QgsCompositionChecker checker( "composermap_overview_invert", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMapInvert );
QVERIFY( testResult );
}
Expand All @@ -195,7 +195,7 @@ void TestQgsComposerMapOverview::overviewMapCenter()

QgsCompositionChecker checker( "composermap_overview_center", mComposition );

bool testResult = checker.testComposition( mReport, 0, 100 );
bool testResult = checker.testComposition( mReport, 0, 0 );
mComposition->removeComposerItem( overviewMapCenter );
QVERIFY( testResult );
}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgscomposerpaper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void TestQgsComposerPaper::markerLinePaper()
{
mComposition->setPageStyleSymbol( mMarkerLineSymbol );
QgsCompositionChecker checker( "composerpaper_markerborder", mComposition );
QVERIFY( checker.testComposition( mReport, 0, 60 ) );
QVERIFY( checker.testComposition( mReport, 0, 0 ) );
}

QTEST_MAIN( TestQgsComposerPaper )
Expand Down
Loading

0 comments on commit 3af68f4

Please sign in to comment.