Skip to content

Commit

Permalink
Fix some clazy warnings in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 3, 2018
1 parent e2d75d5 commit c2af8ca
Showing 1 changed file with 34 additions and 29 deletions.
63 changes: 34 additions & 29 deletions tests/src/core/testqgscompositionconverter.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ class TestQgsCompositionConverter: public QObject


private: private:


void checkRenderedImage( QgsLayout *layout, const QString testName, const int pageNumber = 0 ); void checkRenderedImage( QgsLayout *layout, const QString &testName, const int pageNumber = 0 );


QDomElement loadComposer( const QString name ); QDomElement loadComposer( const QString &name );


QString mReport; QString mReport;


Expand Down Expand Up @@ -192,7 +192,7 @@ void TestQgsCompositionConverter::cleanup()


void TestQgsCompositionConverter::importComposerTemplateLabel() void TestQgsCompositionConverter::importComposerTemplateLabel()
{ {
QDomElement composerElem( loadComposer( "2x_template_label.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_label.qpt" ) ) );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement(); QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
Expand Down Expand Up @@ -225,7 +225,7 @@ void TestQgsCompositionConverter::importComposerTemplateLabel()


void TestQgsCompositionConverter::importComposerTemplateShape() void TestQgsCompositionConverter::importComposerTemplateShape()
{ {
QDomElement composerElem( loadComposer( "2x_template_shape.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_shape.qpt" ) ) );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement(); QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
Expand Down Expand Up @@ -261,7 +261,7 @@ void TestQgsCompositionConverter::importComposerTemplateShape()


void TestQgsCompositionConverter::importComposerTemplatePicture() void TestQgsCompositionConverter::importComposerTemplatePicture()
{ {
QDomElement composerElem( loadComposer( "2x_template_pictures.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_pictures.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand Down Expand Up @@ -293,7 +293,7 @@ void TestQgsCompositionConverter::importComposerTemplatePicture()


void TestQgsCompositionConverter::importComposerTemplatePolygon() void TestQgsCompositionConverter::importComposerTemplatePolygon()
{ {
QDomElement composerElem( loadComposer( "2x_template_polygon.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_polygon.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand All @@ -319,7 +319,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolygon()


void TestQgsCompositionConverter::importComposerTemplatePolyline() void TestQgsCompositionConverter::importComposerTemplatePolyline()
{ {
QDomElement composerElem( loadComposer( "2x_template_polyline.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_polyline.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand Down Expand Up @@ -347,7 +347,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolyline()


void TestQgsCompositionConverter::importComposerTemplateArrow() void TestQgsCompositionConverter::importComposerTemplateArrow()
{ {
QDomElement composerElem( loadComposer( "2x_template_arrow.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_arrow.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand Down Expand Up @@ -376,7 +376,7 @@ void TestQgsCompositionConverter::importComposerTemplateArrow()


void TestQgsCompositionConverter::importComposerTemplateMap() void TestQgsCompositionConverter::importComposerTemplateMap()
{ {
QDomElement composerElem( loadComposer( "2x_template_map_overview.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_map_overview.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand Down Expand Up @@ -410,6 +410,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
QStringList mapUuids; QStringList mapUuids;
QList<QgsLayoutItemMap *> mapItems; QList<QgsLayoutItemMap *> mapItems;
layout->layoutItems<QgsLayoutItemMap>( mapItems ); layout->layoutItems<QgsLayoutItemMap>( mapItems );
mapUuids.reserve( mapItems.count() );
for ( auto const &item : mapItems ) for ( auto const &item : mapItems )
{ {
mapUuids << item->uuid(); mapUuids << item->uuid();
Expand All @@ -419,9 +420,10 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
int count = 0; int count = 0;
QList<QgsLayoutItemMap *> items; QList<QgsLayoutItemMap *> items;
layout->layoutItems<QgsLayoutItemMap>( items ); layout->layoutItems<QgsLayoutItemMap>( items );
for ( auto const &mapItem : items ) for ( auto const &mapItem : qgis::as_const( items ) )
{ {
for ( auto const &item : mapItem->overviews()->asList() ) const auto overviewItems = mapItem->overviews()->asList();
for ( auto const &item : overviewItems )
{ {
if ( ! item->map( )->uuid().isEmpty( ) ) if ( ! item->map( )->uuid().isEmpty( ) )
{ {
Expand All @@ -443,7 +445,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()


void TestQgsCompositionConverter::importComposerTemplateLegend() void TestQgsCompositionConverter::importComposerTemplateLegend()
{ {
QDomElement composerElem( loadComposer( "2x_template_legend.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_legend.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand All @@ -469,7 +471,7 @@ void TestQgsCompositionConverter::importComposerTemplateLegend()


void TestQgsCompositionConverter::importComposerTemplateAttributeTable() void TestQgsCompositionConverter::importComposerTemplateAttributeTable()
{ {
QDomElement composerElem( loadComposer( "2x_template_attributetable.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_attributetable.qpt" ) ) );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement(); QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
Expand All @@ -493,7 +495,7 @@ void TestQgsCompositionConverter::importComposerTemplateAttributeTable()


void TestQgsCompositionConverter::importComposerTemplateHtml() void TestQgsCompositionConverter::importComposerTemplateHtml()
{ {
QDomElement composerElem( loadComposer( "2x_template_html.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_html.qpt" ) ) );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement(); QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
Expand All @@ -517,7 +519,7 @@ void TestQgsCompositionConverter::importComposerTemplateHtml()


void TestQgsCompositionConverter::importComposerTemplateScaleBar() void TestQgsCompositionConverter::importComposerTemplateScaleBar()
{ {
QDomElement composerElem( loadComposer( "2x_template_scalebar.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_scalebar.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
Expand Down Expand Up @@ -564,7 +566,7 @@ void TestQgsCompositionConverter::convertComposition()
void TestQgsCompositionConverter::isCompositionTemplate() void TestQgsCompositionConverter::isCompositionTemplate()
{ {
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" ); QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" );
QDomDocument doc( "mydocument" ); QDomDocument doc( QStringLiteral( "mydocument" ) );
QFile file( templatePath ); QFile file( templatePath );
QVERIFY( file.open( QIODevice::ReadOnly ) ); QVERIFY( file.open( QIODevice::ReadOnly ) );
QVERIFY( doc.setContent( &file ) ); QVERIFY( doc.setContent( &file ) );
Expand All @@ -577,7 +579,7 @@ void TestQgsCompositionConverter::isCompositionTemplate()
void TestQgsCompositionConverter::convertCompositionTemplate() void TestQgsCompositionConverter::convertCompositionTemplate()
{ {
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" ); QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/2x_template.qpt" );
QDomDocument doc( "mydocument" ); QDomDocument doc( QStringLiteral( "mydocument" ) );
QFile file( templatePath ); QFile file( templatePath );
QVERIFY( file.open( QIODevice::ReadOnly ) ); QVERIFY( file.open( QIODevice::ReadOnly ) );
QVERIFY( doc.setContent( &file ) ); QVERIFY( doc.setContent( &file ) );
Expand All @@ -599,7 +601,7 @@ void TestQgsCompositionConverter::convertCompositionTemplate()


void TestQgsCompositionConverter::importComposerTemplate() void TestQgsCompositionConverter::importComposerTemplate()
{ {
QDomElement composerElem( loadComposer( "2x_template.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template.qpt" ) ) );
QgsProject project; QgsProject project;
project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" ); project.read( QStringLiteral( TEST_DATA_DIR ) + "/layouts/sample_project.qgs" );
QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement(); QDomElement docElem = composerElem.elementsByTagName( QStringLiteral( "Composition" ) ).at( 0 ).toElement();
Expand All @@ -614,7 +616,8 @@ void TestQgsCompositionConverter::importComposerTemplate()
QStringList mapUuids; QStringList mapUuids;
QList<QgsLayoutItemMap *> mapItems; QList<QgsLayoutItemMap *> mapItems;
layout->layoutItems<QgsLayoutItemMap>( mapItems ); layout->layoutItems<QgsLayoutItemMap>( mapItems );
for ( auto const &item : mapItems ) mapUuids.reserve( mapItems.count() );
for ( auto const &item : qgis::as_const( mapItems ) )
{ {
mapUuids << item->uuid(); mapUuids << item->uuid();
} }
Expand All @@ -624,7 +627,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
int count = 0; int count = 0;
QList<QgsLayoutItemPicture *> items; QList<QgsLayoutItemPicture *> items;
layout->layoutItems<QgsLayoutItemPicture>( items ); layout->layoutItems<QgsLayoutItemPicture>( items );
for ( auto const &item : items ) for ( auto const &item : qgis::as_const( items ) )
{ {
if ( item->linkedMap() ) if ( item->linkedMap() )
{ {
Expand All @@ -642,7 +645,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
int count = 0; int count = 0;
QList<QgsLayoutItemLegend *> items; QList<QgsLayoutItemLegend *> items;
layout->layoutItems<QgsLayoutItemLegend>( items ); layout->layoutItems<QgsLayoutItemLegend>( items );
for ( auto const &item : items ) for ( auto const &item : qgis::as_const( items ) )
{ {
if ( item->linkedMap() ) if ( item->linkedMap() )
{ {
Expand All @@ -659,7 +662,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
int count = 0; int count = 0;
QList<QgsLayoutItemScaleBar *> items; QList<QgsLayoutItemScaleBar *> items;
layout->layoutItems<QgsLayoutItemScaleBar>( items ); layout->layoutItems<QgsLayoutItemScaleBar>( items );
for ( auto const &item : items ) for ( auto const &item : qgis::as_const( items ) )
{ {
if ( item->linkedMap( ) ) if ( item->linkedMap( ) )
{ {
Expand All @@ -678,7 +681,7 @@ void TestQgsCompositionConverter::importComposerTemplate()


void TestQgsCompositionConverter::importComposerAtlas() void TestQgsCompositionConverter::importComposerAtlas()
{ {
QDomElement composerElem( loadComposer( "2x_template_atlas.qpt" ) ); QDomElement composerElem( loadComposer( QStringLiteral( "2x_template_atlas.qpt" ) ) );
QVERIFY( !composerElem.isNull() ); QVERIFY( !composerElem.isNull() );
QVERIFY( !composerElem.attribute( QStringLiteral( "title" ) ).isEmpty() ); QVERIFY( !composerElem.attribute( QStringLiteral( "title" ) ).isEmpty() );
QgsProject project; QgsProject project;
Expand All @@ -696,23 +699,25 @@ void TestQgsCompositionConverter::importComposerAtlas()


} }


void TestQgsCompositionConverter::checkRenderedImage( QgsLayout *layout, const QString testName, const int pageNumber ) void TestQgsCompositionConverter::checkRenderedImage( QgsLayout *layout, const QString &testName, const int pageNumber )
{ {
QgsLayoutChecker checker( testName + "_" + QString::number( pageNumber ), layout ); QgsLayoutChecker checker( testName + '_' + QString::number( pageNumber ), layout );
QSize size( layout->pageCollection()->page( pageNumber )->sizeWithUnits().width() * 3.77, layout->pageCollection()->page( pageNumber )->sizeWithUnits().height() * 3.77 ); QSize size( layout->pageCollection()->page( pageNumber )->sizeWithUnits().width() * 3.77, layout->pageCollection()->page( pageNumber )->sizeWithUnits().height() * 3.77 );
checker.setSize( size ); checker.setSize( size );
checker.setControlPathPrefix( QStringLiteral( "compositionconverter" ) ); checker.setControlPathPrefix( QStringLiteral( "compositionconverter" ) );
QVERIFY( checker.testLayout( mReport, pageNumber, 0, false ) ); QVERIFY( checker.testLayout( mReport, pageNumber, 0, false ) );
} }




QDomElement TestQgsCompositionConverter::loadComposer( const QString name ) QDomElement TestQgsCompositionConverter::loadComposer( const QString &name )
{ {
QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/" + name ); QString templatePath( QStringLiteral( TEST_DATA_DIR ) + "/layouts/" + name );
QDomDocument doc( "mydocument" ); QDomDocument doc( QStringLiteral( "mydocument" ) );
QFile file( templatePath ); QFile file( templatePath );
Q_ASSERT( file.open( QIODevice::ReadOnly ) ); bool res = file.open( QIODevice::ReadOnly );
Q_ASSERT( doc.setContent( &file ) ); Q_ASSERT( res );
res = doc.setContent( &file );
Q_ASSERT( res );
file.close(); file.close();
QDomNodeList nodes( doc.elementsByTagName( QStringLiteral( "Composer" ) ) ); QDomNodeList nodes( doc.elementsByTagName( QStringLiteral( "Composer" ) ) );
if ( nodes.length() > 0 ) if ( nodes.length() > 0 )
Expand Down

0 comments on commit c2af8ca

Please sign in to comment.