@@ -758,17 +758,21 @@ void TestQgsComposition::mapLayersRestoredFromTemplate()
758
758
QgsVectorLayer *layer2 = new QgsVectorLayer ( vectorFileInfo2.filePath (),
759
759
vectorFileInfo2.completeBaseName (),
760
760
" ogr" );
761
+ QFileInfo rasterFileInfo ( QString ( TEST_DATA_DIR ) + " /landsat.tif" );
762
+ QgsRasterLayer *rl = new QgsRasterLayer ( rasterFileInfo.filePath (),
763
+ rasterFileInfo.completeBaseName () );
761
764
762
765
QgsMapLayerRegistry::instance ()->addMapLayer ( layer2 );
763
766
QgsMapLayerRegistry::instance ()->addMapLayer ( layer );
767
+ QgsMapLayerRegistry::instance ()->addMapLayer ( rl );
764
768
765
769
// create composition
766
770
QgsMapSettings ms;
767
771
QgsComposition c ( ms );
768
772
// add a map
769
773
QgsComposerMap *map = new QgsComposerMap ( &c, 1 , 1 , 10 , 10 );
770
774
c.addComposerMap ( map );
771
- map->setLayerSet ( QStringList () << layer->id () << layer2->id () );
775
+ map->setLayerSet ( QStringList () << layer->id () << layer2->id () << rl-> id () );
772
776
773
777
// save composition to template
774
778
QDomDocument doc;
@@ -785,8 +789,11 @@ void TestQgsComposition::mapLayersRestoredFromTemplate()
785
789
QgsVectorLayer *layer4 = new QgsVectorLayer ( vectorFileInfo2.filePath (),
786
790
vectorFileInfo2.completeBaseName (),
787
791
" ogr" );
792
+ QgsRasterLayer *rl5 = new QgsRasterLayer ( rasterFileInfo.filePath (),
793
+ rasterFileInfo.completeBaseName () );
788
794
QgsMapLayerRegistry::instance ()->addMapLayer ( layer4 );
789
795
QgsMapLayerRegistry::instance ()->addMapLayer ( layer3 );
796
+ QgsMapLayerRegistry::instance ()->addMapLayer ( rl5 );
790
797
791
798
// make a new composition from template
792
799
QgsComposition c2 ( ms );
@@ -797,7 +804,7 @@ void TestQgsComposition::mapLayersRestoredFromTemplate()
797
804
QgsComposerMap *map2 = static_cast < QgsComposerMap *>( maps.at ( 0 ) );
798
805
QVERIFY ( map2 );
799
806
800
- QCOMPARE ( map2->layerSet (), QStringList () << layer3->id () << layer4->id () );
807
+ QCOMPARE ( map2->layerSet (), QStringList () << layer3->id () << layer4->id () << rl5-> id () );
801
808
}
802
809
803
810
void TestQgsComposition::mapLayersStyleOverrideRestoredFromTemplate ()
0 commit comments