Skip to content

Commit 83bb33c

Browse files
jef-njef-n
committed
cleanup composer test map settings
1 parent 3856ccf commit 83bb33c

20 files changed

+110
-91
lines changed

‎tests/src/core/testqgscomposerdd.cpp‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class TestQgsComposerDD : public QObject
5353
void ddEvaluate(); //test setting/evaluating data defined value
5454

5555
private:
56-
QgsComposition* mComposition;
57-
QgsMapSettings mMapSettings;
56+
QgsComposition *mComposition;
57+
QgsMapSettings *mMapSettings;
5858
QgsVectorLayer* mVectorLayer;
5959
QgsComposerMap* mAtlasMap;
6060
QgsAtlasComposition* mAtlas;
@@ -66,6 +66,8 @@ void TestQgsComposerDD::initTestCase()
6666
QgsApplication::init();
6767
QgsApplication::initQgis();
6868

69+
mMapSettings = new QgsMapSettings();
70+
6971
//create maplayers from testdata and add to layer registry
7072
QFileInfo vectorFileInfo( QString( TEST_DATA_DIR ) + "/france_parts.shp" );
7173
mVectorLayer = new QgsVectorLayer( vectorFileInfo.filePath(),
@@ -79,15 +81,15 @@ void TestQgsComposerDD::initTestCase()
7981
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mVectorLayer );
8082

8183
//create composition with composer map
82-
mMapSettings.setLayers( QStringList() << mVectorLayer->id() );
83-
mMapSettings.setCrsTransformEnabled( true );
84-
mMapSettings.setMapUnits( QGis::Meters );
84+
mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
85+
mMapSettings->setCrsTransformEnabled( true );
86+
mMapSettings->setMapUnits( QGis::Meters );
8587

8688
// select epsg:2154
8789
QgsCoordinateReferenceSystem crs;
8890
crs.createFromSrid( 2154 );
89-
mMapSettings.setDestinationCrs( crs );
90-
mComposition = new QgsComposition( mMapSettings );
91+
mMapSettings->setDestinationCrs( crs );
92+
mComposition = new QgsComposition( *mMapSettings );
9193
mComposition->setPaperSize( 297, 210 ); //A4 landscape
9294

9395
// fix the renderer, fill with green
@@ -114,6 +116,7 @@ void TestQgsComposerDD::initTestCase()
114116
void TestQgsComposerDD::cleanupTestCase()
115117
{
116118
delete mComposition;
119+
delete mMapSettings;
117120

118121
QString myReportFile = QDir::tempPath() + "/qgistest.html";
119122
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposereffects.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class TestQgsComposerEffects : public QObject
3434
: mComposition( 0 )
3535
, mComposerRect1( 0 )
3636
, mComposerRect2( 0 )
37+
, mMapSettings( 0 )
3738
{}
3839

3940
private slots:
@@ -46,9 +47,9 @@ class TestQgsComposerEffects : public QObject
4647

4748
private:
4849
QgsComposition* mComposition;
49-
QgsComposerShape* mComposerRect1;
50-
QgsComposerShape* mComposerRect2;
51-
QgsMapSettings mMapSettings;
50+
QgsComposerShape *mComposerRect1;
51+
QgsComposerShape *mComposerRect2;
52+
QgsMapSettings *mMapSettings;
5253
QString mReport;
5354
};
5455

@@ -57,9 +58,11 @@ void TestQgsComposerEffects::initTestCase()
5758
QgsApplication::init();
5859
QgsApplication::initQgis();
5960

61+
mMapSettings = new QgsMapSettings();
62+
6063
//create composition with two rectangles
6164

62-
mComposition = new QgsComposition( mMapSettings );
65+
mComposition = new QgsComposition( *mMapSettings );
6366
mComposition->setPaperSize( 297, 210 ); //A4 landscape
6467
mComposerRect1 = new QgsComposerShape( 20, 20, 150, 100, mComposition );
6568
mComposerRect1->setShapeType( QgsComposerShape::Rectangle );
@@ -76,6 +79,7 @@ void TestQgsComposerEffects::initTestCase()
7679
void TestQgsComposerEffects::cleanupTestCase()
7780
{
7881
delete mComposition;
82+
delete mMapSettings;
7983

8084
QString myReportFile = QDir::tempPath() + "/qgistest.html";
8185
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposergroup.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include "qgscomposerlabel.h"
2020
#include "qgscomposition.h"
2121
#include "qgscompositionchecker.h"
22+
#include "qgsapplication.h"
23+
2224
#include <QObject>
2325
#include <QtTest/QtTest>
2426

@@ -45,8 +47,8 @@ class TestQgsComposerGroup : public QObject
4547
void undoRedo(); //test that group/ungroup undo/redo commands don't crash
4648

4749
private:
48-
QgsComposition* mComposition;
49-
QgsMapSettings mMapSettings;
50+
QgsComposition *mComposition;
51+
QgsMapSettings *mMapSettings;
5052
QgsComposerLabel* mItem1;
5153
QgsComposerLabel* mItem2;
5254
QgsComposerItemGroup* mGroup;
@@ -55,7 +57,11 @@ class TestQgsComposerGroup : public QObject
5557

5658
void TestQgsComposerGroup::initTestCase()
5759
{
58-
mComposition = new QgsComposition( mMapSettings );
60+
QgsApplication::init();
61+
QgsApplication::initQgis();
62+
63+
mMapSettings = new QgsMapSettings();
64+
mComposition = new QgsComposition( *mMapSettings );
5965
mComposition->setPaperSize( 297, 210 ); //A4 landscape
6066

6167
//create some items
@@ -72,6 +78,7 @@ void TestQgsComposerGroup::initTestCase()
7278
void TestQgsComposerGroup::cleanupTestCase()
7379
{
7480
delete mComposition;
81+
delete mMapSettings;
7582

7683
QString myReportFile = QDir::tempPath() + "/qgistest.html";
7784
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposerhtml.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ class TestQgsComposerHtml : public QObject
4444
void tableMultiFrame(); //tests multiframe capabilities of composer html
4545
void htmlMultiFrameSmartBreak(); //tests smart page breaks in html multi frame
4646
private:
47-
QgsComposition* mComposition;
48-
QgsMapSettings mMapSettings;
47+
QgsComposition *mComposition;
48+
QgsMapSettings *mMapSettings;
4949
QString mReport;
5050
QFont mTestFont;
5151
};
5252

5353
TestQgsComposerHtml::TestQgsComposerHtml()
54-
: mComposition( NULL )
54+
: mComposition( 0 )
55+
, mMapSettings( 0 )
5556
{
5657

5758
}
@@ -61,7 +62,8 @@ void TestQgsComposerHtml::initTestCase()
6162
QgsApplication::init();
6263
QgsApplication::initQgis();
6364

64-
mComposition = new QgsComposition( mMapSettings );
65+
mMapSettings = new QgsMapSettings();
66+
mComposition = new QgsComposition( *mMapSettings );
6567
mComposition->setPaperSize( 297, 210 ); //A4 landscape
6668

6769
mReport = "<h1>Composer HTML Tests</h1>\n";
@@ -73,6 +75,7 @@ void TestQgsComposerHtml::initTestCase()
7375
void TestQgsComposerHtml::cleanupTestCase()
7476
{
7577
delete mComposition;
78+
delete mMapSettings;
7679

7780
QString myReportFile = QDir::tempPath() + "/qgistest.html";
7881
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposerlabel.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class TestQgsComposerLabel : public QObject
3434
TestQgsComposerLabel()
3535
: mComposition( 0 )
3636
, mComposerLabel( 0 )
37+
, mMapSettings( 0 )
3738
, mVectorLayer( 0 )
3839
{}
3940

@@ -55,7 +56,7 @@ class TestQgsComposerLabel : public QObject
5556
private:
5657
QgsComposition* mComposition;
5758
QgsComposerLabel* mComposerLabel;
58-
QgsMapSettings mMapSettings;
59+
QgsMapSettings *mMapSettings;
5960
QgsVectorLayer* mVectorLayer;
6061
};
6162

@@ -64,6 +65,8 @@ void TestQgsComposerLabel::initTestCase()
6465
QgsApplication::init();
6566
QgsApplication::initQgis();
6667

68+
mMapSettings = new QgsMapSettings();
69+
6770
//create maplayers from testdata and add to layer registry
6871
QFileInfo vectorFileInfo( QString( TEST_DATA_DIR ) + "/" + "france_parts.shp" );
6972
mVectorLayer = new QgsVectorLayer( vectorFileInfo.filePath(),
@@ -72,9 +75,9 @@ void TestQgsComposerLabel::initTestCase()
7275
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mVectorLayer );
7376

7477
//create composition with composer map
75-
mMapSettings.setLayers( QStringList() << mVectorLayer->id() );
76-
mMapSettings.setCrsTransformEnabled( false );
77-
mComposition = new QgsComposition( mMapSettings );
78+
mMapSettings->setLayers( QStringList() << mVectorLayer->id() );
79+
mMapSettings->setCrsTransformEnabled( false );
80+
mComposition = new QgsComposition( *mMapSettings );
7881
mComposition->setPaperSize( 297, 210 ); //A4 landscape
7982

8083
mComposerLabel = new QgsComposerLabel( mComposition );
@@ -86,6 +89,7 @@ void TestQgsComposerLabel::initTestCase()
8689
void TestQgsComposerLabel::cleanupTestCase()
8790
{
8891
delete mComposition;
92+
delete mMapSettings;
8993

9094
QgsApplication::exitQgis();
9195
}

‎tests/src/core/testqgscomposermap.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ class TestQgsComposerMap : public QObject
4848
void mapPolygonVertices(); // test mapPolygon function with no map rotation
4949

5050
private:
51-
QgsComposition* mComposition;
52-
QgsComposerMap* mComposerMap;
53-
QgsMapSettings mMapSettings;
51+
QgsComposition *mComposition;
52+
QgsComposerMap *mComposerMap;
53+
QgsMapSettings *mMapSettings;
5454
QgsRasterLayer* mRasterLayer;
5555
QString mReport;
5656
};
@@ -60,6 +60,8 @@ void TestQgsComposerMap::initTestCase()
6060
QgsApplication::init();
6161
QgsApplication::initQgis();
6262

63+
mMapSettings = new QgsMapSettings();
64+
6365
//create maplayers from testdata and add to layer registry
6466
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + "/landsat.tif" );
6567
mRasterLayer = new QgsRasterLayer( rasterFileInfo.filePath(),
@@ -70,9 +72,9 @@ void TestQgsComposerMap::initTestCase()
7072
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
7173

7274
//create composition with composer map
73-
mMapSettings.setLayers( QStringList() << mRasterLayer->id() );
74-
mMapSettings.setCrsTransformEnabled( false );
75-
mComposition = new QgsComposition( mMapSettings );
75+
mMapSettings->setLayers( QStringList() << mRasterLayer->id() );
76+
mMapSettings->setCrsTransformEnabled( false );
77+
mComposition = new QgsComposition( *mMapSettings );
7678
mComposition->setPaperSize( 297, 210 ); //A4 landscape
7779
mComposerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
7880
mComposerMap->setFrameEnabled( true );
@@ -84,6 +86,7 @@ void TestQgsComposerMap::initTestCase()
8486
void TestQgsComposerMap::cleanupTestCase()
8587
{
8688
delete mComposition;
89+
delete mMapSettings;
8790

8891
QString myReportFile = QDir::tempPath() + "/qgistest.html";
8992
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposermapgrid.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class TestQgsComposerMapGrid : public QObject
3232

3333
public:
3434
TestQgsComposerMapGrid();
35-
~TestQgsComposerMapGrid();
3635

3736
private slots:
3837
void initTestCase();// will be called before the first testfunction is executed.
@@ -76,18 +75,15 @@ TestQgsComposerMapGrid::TestQgsComposerMapGrid()
7675
mMapSettings = new QgsMapSettings();
7776
}
7877

79-
TestQgsComposerMapGrid::~TestQgsComposerMapGrid()
80-
{
81-
delete mMapSettings;
82-
}
83-
8478
void TestQgsComposerMapGrid::initTestCase()
8579
{
8680
mReport = "<h1>Composer Map Grid Tests</h1>\n";
8781
}
8882

8983
void TestQgsComposerMapGrid::cleanupTestCase()
9084
{
85+
delete mMapSettings;
86+
9187
QString myReportFile = QDir::tempPath() + "/qgistest.html";
9288
QFile myFile( myReportFile );
9389
if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )

‎tests/src/core/testqgscomposermapoverview.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TestQgsComposerMapOverview : public QObject
5454
private:
5555
QgsComposition* mComposition;
5656
QgsComposerMap* mComposerMap;
57-
QgsMapSettings mMapSettings;
57+
QgsMapSettings *mMapSettings;
5858
QgsRasterLayer* mRasterLayer;
5959
QString mReport;
6060
};
@@ -64,6 +64,8 @@ void TestQgsComposerMapOverview::initTestCase()
6464
QgsApplication::init();
6565
QgsApplication::initQgis();
6666

67+
mMapSettings = new QgsMapSettings();
68+
6769
//create maplayers from testdata and add to layer registry
6870
QFileInfo rasterFileInfo( QString( TEST_DATA_DIR ) + "/rgb256x256.png" );
6971
mRasterLayer = new QgsRasterLayer( rasterFileInfo.filePath(),
@@ -74,9 +76,9 @@ void TestQgsComposerMapOverview::initTestCase()
7476
QgsMapLayerRegistry::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
7577

7678
//create composition with composer map
77-
mMapSettings.setLayers( QStringList() << mRasterLayer->id() );
78-
mMapSettings.setCrsTransformEnabled( false );
79-
mComposition = new QgsComposition( mMapSettings );
79+
mMapSettings->setLayers( QStringList() << mRasterLayer->id() );
80+
mMapSettings->setCrsTransformEnabled( false );
81+
mComposition = new QgsComposition( *mMapSettings );
8082
mComposition->setPaperSize( 297, 210 ); //A4 landscape
8183
mComposerMap = new QgsComposerMap( mComposition, 20, 20, 200, 100 );
8284
mComposerMap->setFrameEnabled( true );
@@ -88,6 +90,7 @@ void TestQgsComposerMapOverview::initTestCase()
8890
void TestQgsComposerMapOverview::cleanupTestCase()
8991
{
9092
delete mComposition;
93+
delete mMapSettings;
9194

9295
QString myReportFile = QDir::tempPath() + "/qgistest.html";
9396
QFile myFile( myReportFile );

‎tests/src/core/testqgscomposermodel.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,28 @@ class TestQgsComposerModel : public QObject
6262
void reorderToBottomWithRemoved(); //test reordering to bottom with removed items
6363

6464
private:
65-
QgsComposition* mComposition;
66-
QgsComposerLabel* mItem1;
67-
QgsComposerLabel* mItem2;
68-
QgsComposerLabel* mItem3;
65+
QgsComposition *mComposition;
66+
QgsMapSettings *mMapSettings;
67+
QgsComposerLabel *mItem1;
68+
QgsComposerLabel *mItem2;
69+
QgsComposerLabel *mItem3;
6970
};
7071

7172
void TestQgsComposerModel::initTestCase()
7273
{
7374
QgsApplication::init();
7475
QgsApplication::initQgis();
7576

76-
QgsMapSettings mapSettings;
77-
mComposition = new QgsComposition( mapSettings );
77+
mMapSettings = new QgsMapSettings();
78+
mComposition = new QgsComposition( *mMapSettings );
7879

7980
mComposition->setPaperSize( 297, 210 ); //A4 landscape
8081
}
8182

8283
void TestQgsComposerModel::cleanupTestCase()
8384
{
8485
delete mComposition;
86+
delete mMapSettings;
8587
}
8688

8789
void TestQgsComposerModel::init()

‎tests/src/core/testqgscomposermultiframe.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,24 @@ class TestQgsComposerMultiFrame : public QObject
4444
void undoRedoRemovedFrame(); //test that undo doesn't crash with removed frames
4545

4646
private:
47-
QgsComposition* mComposition;
47+
QgsComposition *mComposition;
48+
QgsMapSettings *mMapSettings;
4849
QString mReport;
4950
};
5051

5152
TestQgsComposerMultiFrame::TestQgsComposerMultiFrame()
52-
: mComposition( NULL )
53+
: mComposition( 0 )
54+
, mMapSettings( 0 )
5355
{
54-
5556
}
5657

5758
void TestQgsComposerMultiFrame::initTestCase()
5859
{
5960
QgsApplication::init();
6061
QgsApplication::initQgis();
6162

62-
QgsMapSettings mapSettings;
63-
mComposition = new QgsComposition( mapSettings );
63+
mMapSettings = new QgsMapSettings();
64+
mComposition = new QgsComposition( *mMapSettings );
6465
mComposition->setPaperSize( 297, 210 ); //A4 landscape
6566

6667
mReport = "<h1>Composer MultiFrame Tests</h1>\n";
@@ -69,6 +70,7 @@ void TestQgsComposerMultiFrame::initTestCase()
6970
void TestQgsComposerMultiFrame::cleanupTestCase()
7071
{
7172
delete mComposition;
73+
delete mMapSettings;
7274

7375
QString myReportFile = QDir::tempPath() + "/qgistest.html";
7476
QFile myFile( myReportFile );

0 commit comments

Comments
 (0)