Skip to content

Commit 858a71f

Browse files
committed
[layout] Add map rendering to tests
1 parent 7062f90 commit 858a71f

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

tests/src/core/testqgscompositionconverter.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "qgsmultirenderchecker.h"
2727
#include "qgssettings.h"
2828

29+
#include "qgsmultibandcolorrenderer.h"
30+
#include "qgsrasterlayer.h"
2931

3032
#include "qgslayoutpagecollection.h"
3133
#include "qgslayoutitemlabel.h"
@@ -113,6 +115,8 @@ class TestQgsCompositionConverter: public QObject
113115

114116
void TestQgsCompositionConverter::initTestCase()
115117
{
118+
QgsApplication::init();
119+
QgsApplication::initQgis();
116120
mReport = QStringLiteral( "<h1>Layout Tests</h1>\n" );
117121
QgsSettings settings;
118122
settings.setValue( QStringLiteral( "svg/searchPathsForSVG" ), QStringLiteral( TEST_DATA_DIR ) ) ;
@@ -337,9 +341,18 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
337341
QgsLayoutItemMap *item = items.at( 0 );
338342
QVERIFY( item->isVisible() );
339343

344+
item->setLayers( project.mapLayers().values() );
345+
346+
for ( auto const &l : project.mapLayers().values() )
347+
{
348+
QVERIFY( l->isValid() );
349+
}
350+
340351
QgsLayoutItemMap *item1 = items.at( 1 );
341352
QVERIFY( item1->isVisible() );
342353
QCOMPARE( item1->opacity(), 0.78 );
354+
item1->setLayers( project.mapLayers().values() );
355+
item1->setExtent( QgsRectangle( -126.5731570061082038, -4.69162199770811128, -88.56641716083402116, 69.08616711370645191 ) );
343356

344357
// Check map ids
345358
QStringList mapUuids;
@@ -370,6 +383,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
370383
QVERIFY( count > 0 );
371384
}
372385

386+
373387
checkRenderedImage( layout.get(), QTest::currentTestFunction(), 0 );
374388

375389
qDeleteAll( items );
@@ -437,6 +451,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
437451

438452
QVERIFY( layout.get() );
439453
QCOMPARE( layout->pageCollection()->pageCount(), 2 );
454+
QCOMPARE( layout->name(), QStringLiteral( "composer title" ) );
440455

441456
// Check map ids
442457
QStringList mapUuids;

tests/testdata/layouts/sample_project.qgs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<evaluateDefaultValues active="0"/>
66
<layer-tree-group expanded="1" checked="Qt::Checked" name="">
77
<customproperties/>
8-
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="lines20171212162314640" source="C:/dev/QGIS/tests/testdata/lines.shp" name="lines">
8+
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="lines20171212162314640" source="../lines.shp" name="lines">
99
<customproperties/>
1010
</layer-tree-layer>
11-
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="points20171212162310546" source="C:/dev/QGIS/tests/testdata/points.shp" name="points">
11+
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="points20171212162310546" source="../points.shp" name="points">
1212
<customproperties/>
1313
</layer-tree-layer>
14-
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="polys20171212162309844" source="C:/dev/QGIS/tests/testdata/polys.shp" name="polys">
14+
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="polys20171212162309844" source="../polys.shp" name="polys">
1515
<customproperties/>
1616
</layer-tree-layer>
1717
</layer-tree-group>
@@ -388,10 +388,10 @@
388388
</styles>
389389
<layer-tree-group expanded="1" checked="Qt::Checked" name="">
390390
<customproperties/>
391-
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="points20171212162310546" source="C:/dev/QGIS/tests/testdata/points.shp" name="points">
391+
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="points20171212162310546" source="../points.shp" name="points">
392392
<customproperties/>
393393
</layer-tree-layer>
394-
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="polys20171212162309844" source="C:/dev/QGIS/tests/testdata/polys.shp" name="polys">
394+
<layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="polys20171212162309844" source="../polys.shp" name="polys">
395395
<customproperties/>
396396
</layer-tree-layer>
397397
</layer-tree-group>
@@ -529,7 +529,7 @@
529529
</ComposerFrame>
530530
<customproperties/>
531531
</ComposerHtml>
532-
<ComposerAttributeTableV2 vectorLayerName="points" source="0" showGrid="1" maxFeatures="30" resizeMode="0" filterFeatures="false" featureFilter="" emptyTableMode="1" wrapString="" wrapBehaviour="0" headerMode="1" backgroundColor="240,33,33,255" showEmptyRows="0" emptyTableMessage="" showOnlyVisibleFeatures="1" vectorLayer="points20171212162310546" vectorLayerSource="C:/dev/QGIS/tests/testdata/points.shp" composerMap="0" headerHAlignment="2" contentFontColor="115,115,115,255" headerFontColor="194,143,12,255" cellMargin="1.2" filterToAtlasIntersection="0" relationId="" gridStrokeWidth="0.7" gridColor="245,57,220,255" showUniqueRowsOnly="1" vectorLayerProvider="ogr">
532+
<ComposerAttributeTableV2 vectorLayerName="points" source="0" showGrid="1" maxFeatures="30" resizeMode="0" filterFeatures="false" featureFilter="" emptyTableMode="1" wrapString="" wrapBehaviour="0" headerMode="1" backgroundColor="240,33,33,255" showEmptyRows="0" emptyTableMessage="" showOnlyVisibleFeatures="1" vectorLayer="points20171212162310546" vectorLayerSource="../points.shp" composerMap="0" headerHAlignment="2" contentFontColor="115,115,115,255" headerFontColor="194,143,12,255" cellMargin="1.2" filterToAtlasIntersection="0" relationId="" gridStrokeWidth="0.7" gridColor="245,57,220,255" showUniqueRowsOnly="1" vectorLayerProvider="ogr">
533533
<headerFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
534534
<contentFontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
535535
<displayColumns>

0 commit comments

Comments
 (0)