sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test fixes and further QgsProject::instance() removals

Browse Source
This commit is contained in:
Martin Dobias 2016-12-11 00:31:27 +08:00
parent 5fc10d6207
commit 483c7f4b86
32 changed files with 63 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/src/core/testqgscomposermap.cpp
View File

@ -90,6 +90,9 @@ void TestQgsComposerMap::initTestCase()
QFileInfo lineFileInfo( QStringLiteral( TEST_DATA_DIR ) + "/lines.shp" );
mLinesLayer = new QgsVectorLayer( lineFileInfo.filePath(),
lineFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
// some layers need to be in project for data-defined layers functionality
QgsProject::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer << mPointsLayer << mPolysLayer << mLinesLayer );
}
void TestQgsComposerMap::cleanupTestCase()
@ -103,11 +106,6 @@ void TestQgsComposerMap::cleanupTestCase()
myFile.close();
}
delete mRasterLayer;
delete mPointsLayer;
delete mPolysLayer;
delete mLinesLayer;
QgsApplication::exitQgis();
}

3
tests/src/core/testqgscomposermapoverview.cpp
View File

@ -74,8 +74,6 @@ void TestQgsComposerMapOverview::initTestCase()
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 1, 2, 3 );
mRasterLayer->setRenderer( rasterRenderer );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
//create composition with composer map
mMapSettings->setLayers( QList<QgsMapLayer*>() << mRasterLayer );
mMapSettings->setCrsTransformEnabled( false );
@ -92,6 +90,7 @@ void TestQgsComposerMapOverview::cleanupTestCase()
{
delete mComposition;
delete mMapSettings;
delete mRasterLayer;
QString myReportFile = QDir::tempPath() + "/qgistest.html";
QFile myFile( myReportFile );

3
tests/src/core/testqgscomposerrotation.cpp
View File

@ -80,8 +80,6 @@ void TestQgsComposerRotation::initTestCase()
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 1, 2, 3 );
mRasterLayer->setRenderer( rasterRenderer );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
mMapSettings->setLayers( QList<QgsMapLayer*>() << mRasterLayer );
mMapSettings->setCrsTransformEnabled( false );
@ -115,6 +113,7 @@ void TestQgsComposerRotation::cleanupTestCase()
delete mComposerRect;
delete mComposition;
delete mMapSettings;
delete mRasterLayer;
QString myReportFile = QDir::tempPath() + "/qgistest.html";
QFile myFile( myReportFile );

3
tests/src/core/testqgscomposerscalebar.cpp
View File

@ -86,8 +86,6 @@ void TestQgsComposerScaleBar::initTestCase()
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 2, 3, 4 );
mRasterLayer->setRenderer( rasterRenderer );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer*>() << mRasterLayer );
//create composition with composer map
mMapSettings->setLayers( QList<QgsMapLayer*>() << mRasterLayer );
@ -127,6 +125,7 @@ void TestQgsComposerScaleBar::cleanupTestCase()
{
delete mComposition;
delete mMapSettings;
delete mRasterLayer;
QString myReportFile = QDir::tempPath() + "/qgistest.html";
QFile myFile( myReportFile );

4
tests/src/core/testqgsdiagram.cpp
View File

@ -87,9 +87,6 @@ class TestQgsDiagram : public QObject
mPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
myPointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
// Register the layer with the registry
QgsProject::instance()->addMapLayer( mPointsLayer );
// Create map composition to draw on
mMapSettings->setLayers( QList<QgsMapLayer*>() << mPointsLayer );
@ -100,6 +97,7 @@ class TestQgsDiagram : public QObject
void cleanupTestCase()
{
delete mMapSettings;
delete mPointsLayer;
QString myReportFile = QDir::tempPath() + "/qgistest.html";
QFile myFile( myReportFile );

6
tests/src/core/testqgsellipsemarker.cpp
View File

@ -98,10 +98,6 @@ void TestQgsEllipseMarkerSymbol::initTestCase()
mpPointsLayer = new QgsVectorLayer( pointFileInfo.filePath(),
pointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
// Register the layer with the registry
QgsProject::instance()->addMapLayers(
QList<QgsMapLayer *>() << mpPointsLayer );
//setup symbol
mEllipseMarkerLayer = new QgsEllipseSymbolLayer();
mMarkerSymbol = new QgsMarkerSymbol();
@ -128,6 +124,8 @@ void TestQgsEllipseMarkerSymbol::cleanupTestCase()
myFile.close();
}
delete mpPointsLayer;
QgsApplication::exitQgis();
}

6
tests/src/core/testqgsfilledmarker.cpp
View File

@ -96,10 +96,6 @@ void TestQgsFilledMarkerSymbol::initTestCase()
mpPointsLayer = new QgsVectorLayer( pointFileInfo.filePath(),
pointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
// Register the layer with the registry
QgsProject::instance()->addMapLayers(
QList<QgsMapLayer *>() << mpPointsLayer );
//setup symbol
QgsGradientFillSymbolLayer* gradientFill = new QgsGradientFillSymbolLayer();
gradientFill->setColor( QColor( "red" ) );
@ -139,6 +135,8 @@ void TestQgsFilledMarkerSymbol::cleanupTestCase()
myFile.close();
}
delete mpPointsLayer;
QgsApplication::exitQgis();
}

6
tests/src/core/testqgsfontmarker.cpp
View File

@ -96,10 +96,6 @@ void TestQgsFontMarkerSymbol::initTestCase()
mpPointsLayer = new QgsVectorLayer( pointFileInfo.filePath(),
pointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
// Register the layer with the registry
QgsProject::instance()->addMapLayers(
QList<QgsMapLayer *>() << mpPointsLayer );
//setup symbol
mFontMarkerLayer = new QgsFontMarkerSymbolLayer();
mMarkerSymbol = new QgsMarkerSymbol();
@ -126,6 +122,8 @@ void TestQgsFontMarkerSymbol::cleanupTestCase()
myFile.close();
}
delete mpPointsLayer;
QgsApplication::exitQgis();
}

6
tests/src/core/testqgsgradients.cpp
View File

@ -106,10 +106,6 @@ void TestQgsGradients::initTestCase()
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
mpPolysLayer->setSimplifyMethod( simplifyMethod );
// Register the layer with the registry
QgsProject::instance()->addMapLayers(
QList<QgsMapLayer *>() << mpPolysLayer );
//setup gradient fill
mGradientFill = new QgsGradientFillSymbolLayer();
mFillSymbol = new QgsFillSymbol();
@ -136,6 +132,8 @@ void TestQgsGradients::cleanupTestCase()
myFile.close();
}
delete mpPolysLayer;
QgsApplication::exitQgis();
}

5
tests/src/core/testqgsinvertedpolygonrenderer.cpp
View File

@ -94,9 +94,6 @@ void TestQgsInvertedPolygon::initTestCase()
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
mpPolysLayer->setSimplifyMethod( simplifyMethod );
// Register the layer with the registry
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mpPolysLayer );
mMapSettings.setLayers( QList<QgsMapLayer*>() << mpPolysLayer );
mReport += QLatin1String( "<h1>Inverted Polygon Renderer Tests</h1>\n" );
}
@ -112,6 +109,8 @@ void TestQgsInvertedPolygon::cleanupTestCase()
myFile.close();
}
delete mpPolysLayer;
QgsApplication::exitQgis();
}

6
tests/src/core/testqgslinefillsymbol.cpp
View File

@ -99,10 +99,6 @@ void TestQgsLineFillSymbol::initTestCase()
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
mpPolysLayer->setSimplifyMethod( simplifyMethod );
// Register the layer with the registry
QgsProject::instance()->addMapLayers(
QList<QgsMapLayer *>() << mpPolysLayer );
//setup gradient fill
mLineFill = new QgsLinePatternFillSymbolLayer();
mFillSymbol = new QgsFillSymbol();
@ -129,6 +125,8 @@ void TestQgsLineFillSymbol::cleanupTestCase()
myFile.close();
}
delete mpPolysLayer;
QgsApplication::exitQgis();
}

11
tests/src/core/testqgsmaprotation.cpp
View File

@ -82,32 +82,24 @@ void TestQgsMapRotation::initTestCase()
mMapSettings = new QgsMapSettings();
QList<QgsMapLayer *> mapLayers;
//create a raster layer that will be used in all tests...
QFileInfo rasterFileInfo( mTestDataDir + "rgb256x256.png" );
mRasterLayer = new QgsRasterLayer( rasterFileInfo.filePath(),
rasterFileInfo.completeBaseName() );
QgsMultiBandColorRenderer* rasterRenderer = new QgsMultiBandColorRenderer( mRasterLayer->dataProvider(), 1, 2, 3 );
mRasterLayer->setRenderer( rasterRenderer );
mapLayers << mRasterLayer;
//create a point layer that will be used in all tests...
QString myPointsFileName = mTestDataDir + "points.shp";
QFileInfo myPointFileInfo( myPointsFileName );
mPointsLayer = new QgsVectorLayer( myPointFileInfo.filePath(),
myPointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
mapLayers << mPointsLayer;
//create a line layer that will be used in all tests...
QString myLinesFileName = mTestDataDir + "lines_cardinals.shp";
QFileInfo myLinesFileInfo( myLinesFileName );
mLinesLayer = new QgsVectorLayer( myLinesFileInfo.filePath(),
myLinesFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
mapLayers << mLinesLayer;
// Register all layers with the registry
QgsProject::instance()->addMapLayers( mapLayers );
// This is needed to correctly set rotation center,
// the actual size doesn't matter as QgsRenderChecker will
@ -128,6 +120,9 @@ TestQgsMapRotation::~TestQgsMapRotation()
void TestQgsMapRotation::cleanupTestCase()
{
delete mMapSettings;
delete mPointsLayer;
delete mLinesLayer;
delete mRasterLayer;
QgsApplication::exitQgis();
QString myReportFile = QDir::tempPath() + "/qgistest.html";

12
tests/src/core/testqgspainteffect.cpp
View File

@ -702,7 +702,6 @@ void TestQgsPaintEffect::layerEffectPolygon()
QgsVectorSimplifyMethod simplifyMethod;
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
polysLayer->setSimplifyMethod( simplifyMethod );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << polysLayer );
QgsMapSettings ms;
QgsSimpleFillSymbolLayer* fill = new QgsSimpleFillSymbolLayer;
@ -721,6 +720,7 @@ void TestQgsPaintEffect::layerEffectPolygon()
mReport += QLatin1String( "<h2>Paint effect symbol layer test (polygon)</h2>\n" );
bool result = mapRenderCheck( QStringLiteral( "painteffect_poly" ), ms );
QVERIFY( result );
delete polysLayer;
}
void TestQgsPaintEffect::layerEffectLine()
@ -733,7 +733,6 @@ void TestQgsPaintEffect::layerEffectLine()
QgsVectorSimplifyMethod simplifyMethod;
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
lineLayer->setSimplifyMethod( simplifyMethod );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << lineLayer );
QgsMapSettings ms;
QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer;
@ -753,6 +752,7 @@ void TestQgsPaintEffect::layerEffectLine()
mReport += QLatin1String( "<h2>Paint effect symbol layer test (line)</h2>\n" );
bool result = mapRenderCheck( QStringLiteral( "painteffect_line" ), ms );
QVERIFY( result );
delete lineLayer;
}
void TestQgsPaintEffect::layerEffectMarker()
@ -762,7 +762,6 @@ void TestQgsPaintEffect::layerEffectMarker()
QFileInfo pointFileInfo( pointFileName );
QgsVectorLayer* pointLayer = new QgsVectorLayer( pointFileInfo.filePath(),
pointFileInfo.completeBaseName(), QStringLiteral( "ogr" ) );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << pointLayer );
QgsMapSettings ms;
QgsSimpleMarkerSymbolLayer* marker = new QgsSimpleMarkerSymbolLayer;
@ -781,6 +780,7 @@ void TestQgsPaintEffect::layerEffectMarker()
mReport += QLatin1String( "<h2>Paint effect symbol layer test (point)</h2>\n" );
bool result = mapRenderCheck( QStringLiteral( "painteffect_marker" ), ms );
QVERIFY( result );
delete pointLayer;
}
void TestQgsPaintEffect::vectorLayerEffect()
@ -793,7 +793,6 @@ void TestQgsPaintEffect::vectorLayerEffect()
QgsVectorSimplifyMethod simplifyMethod;
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
polysLayer->setSimplifyMethod( simplifyMethod );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << polysLayer );
QgsMapSettings ms;
QgsSimpleFillSymbolLayer* fill = new QgsSimpleFillSymbolLayer;
@ -816,6 +815,7 @@ void TestQgsPaintEffect::vectorLayerEffect()
mReport += QLatin1String( "<h2>Paint effect layer test</h2>\n" );
bool result = mapRenderCheck( QStringLiteral( "painteffect_layer" ), ms );
QVERIFY( result );
delete polysLayer;
}
void TestQgsPaintEffect::mapUnits()
@ -828,7 +828,6 @@ void TestQgsPaintEffect::mapUnits()
QgsVectorSimplifyMethod simplifyMethod;
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
lineLayer->setSimplifyMethod( simplifyMethod );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << lineLayer );
QgsMapSettings ms;
QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer;
@ -851,6 +850,7 @@ void TestQgsPaintEffect::mapUnits()
mReport += QLatin1String( "<h2>Paint effect map units test</h2>\n" );
bool result = mapRenderCheck( QStringLiteral( "painteffect_mapunits" ), ms );
QVERIFY( result );
delete lineLayer;
}
void TestQgsPaintEffect::composer()
@ -864,7 +864,6 @@ void TestQgsPaintEffect::composer()
QgsVectorSimplifyMethod simplifyMethod;
simplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
lineLayer->setSimplifyMethod( simplifyMethod );
QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << lineLayer );
QgsMapSettings ms;
QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer;
@ -902,6 +901,7 @@ void TestQgsPaintEffect::composer()
bool result = imageCheck( QStringLiteral( "painteffect_composer" ), outputImage );
delete composition;
QVERIFY( result );
delete lineLayer;
}

8
tests/src/python/test_qgsarrowsymbollayer.py
View File

@ -88,7 +88,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase):
sym_layer.setSubSymbol(fill_sym)
sym.changeSymbolLayer(0, sym_layer)
rendered_layers = [self.lines_layer.id()]
rendered_layers = [self.lines_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()
@ -104,7 +104,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase):
sym_layer.setSubSymbol(fill_sym)
sym.changeSymbolLayer(0, sym_layer)
rendered_layers = [self.lines_layer.id()]
rendered_layers = [self.lines_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()
@ -120,7 +120,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase):
sym_layer.setSubSymbol(fill_sym)
sym.changeSymbolLayer(0, sym_layer)
rendered_layers = [self.lines_layer.id()]
rendered_layers = [self.lines_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()
@ -140,7 +140,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase):
sym_layer.setSubSymbol(fill_sym)
sym.changeSymbolLayer(0, sym_layer)
rendered_layers = [self.lines_layer.id()]
rendered_layers = [self.lines_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()

5
tests/src/python/test_qgsatlascomposition.py
View File

@ -44,8 +44,7 @@ class TestQgsAtlasComposition(unittest.TestCase):
# create composition with composer map
self.mapSettings = QgsMapSettings()
layerStringList = []
layerStringList.append(mVectorLayer.id())
layerStringList = [mVectorLayer]
self.mapSettings.setLayers(layerStringList)
self.mapSettings.setCrsTransformEnabled(True)
self.mapSettings.setMapUnits(QgsUnitTypes.DistanceMeters)
@ -286,7 +285,7 @@ class TestQgsAtlasComposition(unittest.TestCase):
# add the point layer to the map settings
layers = self.mapSettings.layers()
layers = [ptLayer.id()] + layers
layers = [ptLayer] + layers
self.mapSettings.setLayers(layers)
# add a legend

18
tests/src/python/test_qgsblendmodes.py
View File

@ -93,7 +93,7 @@ class TestQgsBlendModes(unittest.TestCase):
# to match blend modes test comparisons background
self.mapSettings = QgsMapSettings()
self.mapSettings.setLayers([self.mRasterLayer1.id(), self.mRasterLayer2.id()])
self.mapSettings.setLayers([self.mRasterLayer1, self.mRasterLayer2])
self.mapSettings.setBackgroundColor(QColor(152, 219, 249))
self.mapSettings.setOutputSize(QSize(400, 400))
self.mapSettings.setOutputDpi(96)
@ -104,9 +104,7 @@ class TestQgsBlendModes(unittest.TestCase):
"""Test that blend modes work for vector layers."""
# Add vector layers to map
myLayers = []
myLayers.append(self.mLineLayer.id())
myLayers.append(self.mPolygonLayer.id())
myLayers = [self.mLineLayer, self.mPolygonLayer]
self.mapSettings.setLayers(myLayers)
self.mapSettings.setExtent(self.extent)
@ -131,9 +129,7 @@ class TestQgsBlendModes(unittest.TestCase):
"""Test that feature blend modes work for vector layers."""
# Add vector layers to map
myLayers = []
myLayers.append(self.mLineLayer.id())
myLayers.append(self.mPolygonLayer.id())
myLayers = [self.mLineLayer, self.mPolygonLayer]
self.mapSettings.setLayers(myLayers)
self.mapSettings.setExtent(self.extent)
@ -156,9 +152,7 @@ class TestQgsBlendModes(unittest.TestCase):
"""Test that layer transparency works for vector layers."""
# Add vector layers to map
myLayers = []
myLayers.append(self.mLineLayer.id())
myLayers.append(self.mPolygonLayer.id())
myLayers = [self.mLineLayer, self.mPolygonLayer]
self.mapSettings.setLayers(myLayers)
self.mapSettings.setExtent(self.extent)
@ -177,9 +171,7 @@ class TestQgsBlendModes(unittest.TestCase):
def testRasterBlending(self):
"""Test that blend modes work for raster layers."""
# Add raster layers to map
myLayers = []
myLayers.append(self.mRasterLayer1.id())
myLayers.append(self.mRasterLayer2.id())
myLayers = [self.mRasterLayer1, self.mRasterLayer2]
self.mapSettings.setLayers(myLayers)
self.mapSettings.setExtent(self.mRasterLayer1.extent())

2
tests/src/python/test_qgscomposerlabel.py
View File

@ -35,7 +35,7 @@ class TestQgsComposerLabel(unittest.TestCase):
# create composition with composer map
mapSettings = QgsMapSettings()
mapSettings.setLayers([mVectorLayer.id()])
mapSettings.setLayers([mVectorLayer])
mapSettings.setCrsTransformEnabled(False)
mComposition = QgsComposition(mapSettings)

8
tests/src/python/test_qgscomposerlegend.py
View File

@ -50,7 +50,7 @@ class TestQgsComposerLegend(unittest.TestCase):
point_layer.setRenderer(QgsSingleSymbolRenderer(marker_symbol))
s = QgsMapSettings()
s.setLayers([point_layer.id()])
s.setLayers([point_layer])
s.setCrsTransformEnabled(False)
composition = QgsComposition(s)
composition.setPaperSize(297, 210)
@ -85,7 +85,7 @@ class TestQgsComposerLegend(unittest.TestCase):
QgsProject.instance().addMapLayers([point_layer])
s = QgsMapSettings()
s.setLayers([point_layer.id()])
s.setLayers([point_layer])
s.setCrsTransformEnabled(False)
composition = QgsComposition(s)
composition.setPaperSize(297, 210)
@ -123,7 +123,7 @@ class TestQgsComposerLegend(unittest.TestCase):
QgsProject.instance().addMapLayers([point_layer])
s = QgsMapSettings()
s.setLayers([point_layer.id()])
s.setLayers([point_layer])
s.setCrsTransformEnabled(False)
composition = QgsComposition(s)
composition.setPaperSize(297, 210)
@ -165,7 +165,7 @@ class TestQgsComposerLegend(unittest.TestCase):
QgsProject.instance().addMapLayers([point_layer])
s = QgsMapSettings()
s.setLayers([point_layer.id()])
s.setLayers([point_layer])
s.setCrsTransformEnabled(False)
composition = QgsComposition(s)
composition.setPaperSize(297, 210)

2
tests/src/python/test_qgscomposermap.py
View File

@ -55,7 +55,7 @@ class TestQgsComposerMap(unittest.TestCase):
# create composition with composer map
self.mMapSettings = QgsMapSettings()
self.mMapSettings.setLayers([mRasterLayer.id()])
self.mMapSettings.setLayers([mRasterLayer])
self.mMapSettings.setCrsTransformEnabled(False)
self.mComposition = QgsComposition(self.mMapSettings)
self.mComposition.setPaperSize(297, 210)

2
tests/src/python/test_qgscomposition.py
View File

@ -102,7 +102,7 @@ class TestQgsComposition(unittest.TestCase):
QgsProject.instance().addMapLayers([myRasterLayer])
myMapSettings = QgsMapSettings()
myMapSettings.setLayers([myRasterLayer.id()])
myMapSettings.setLayers([myRasterLayer])
myMapSettings.setCrsTransformEnabled(False)
myComposition = QgsComposition(myMapSettings)

4
tests/src/python/test_qgsgeometrygeneratorsymbollayer.py
View File

@ -90,7 +90,7 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase):
sym_layer.setSymbolType(QgsSymbol.Marker)
sym.changeSymbolLayer(0, sym_layer)
rendered_layers = [self.polys_layer.id()]
rendered_layers = [self.polys_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()
@ -109,7 +109,7 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase):
marker_layer.setSymbolType(QgsSymbol.Marker)
sym.appendSymbolLayer(marker_layer)
rendered_layers = [self.polys_layer.id()]
rendered_layers = [self.polys_layer]
self.mapsettings.setLayers(rendered_layers)
renderchecker = QgsMultiRenderChecker()

2
tests/src/python/test_qgsnullsymbolrenderer.py
View File

@ -57,7 +57,7 @@ class TestQgsNullSymbolRenderer(unittest.TestCase):
self.renderer = QgsNullSymbolRenderer()
self.layer.setRenderer(self.renderer)
rendered_layers = [self.layer.id()]
rendered_layers = [self.layer]
self.mapsettings = self.iface.mapCanvas().mapSettings()
self.mapsettings.setOutputSize(QSize(400, 400))
self.mapsettings.setOutputDpi(96)

6
tests/src/python/test_qgspallabeling_base.py
View File

@ -154,8 +154,8 @@ class TestQgsPalLabeling(unittest.TestCase):
lyr_id = layer.id()
cls._MapRegistry.removeMapLayer(lyr_id)
ms_layers = cls._MapSettings.layers()
if lyr_id in ms_layers:
ms_layers.remove(lyr_id)
if layer in ms_layers:
ms_layers.remove(layer)
cls._MapSettings.setLayers(ms_layers)
@classmethod
@ -176,7 +176,7 @@ class TestQgsPalLabeling(unittest.TestCase):
# qDebug('render_lyr = {0}'.format(repr(vlayer)))
cls._MapRegistry.addMapLayer(vlayer)
# place new layer on top of render stack
render_lyrs = [vlayer.id()]
render_lyrs = [vlayer]
render_lyrs.extend(cls._MapSettings.layers())
# qDebug('render_lyrs = {0}'.format(repr(render_lyrs)))
cls._MapSettings.setLayers(render_lyrs)

2
tests/src/python/test_qgspallabeling_server.py
View File

@ -116,7 +116,7 @@ class TestServerBase(TestQgsPalLabeling):
ms = self._TestMapSettings
osize = ms.outputSize()
dpi = str(int(ms.outputDpi()))
lyrs = [str(self._MapRegistry.mapLayer(i).name()) for i in ms.layers()]
lyrs = [str(layer.name()) for layer in ms.layers()]
lyrs.reverse()
params = {
'SERVICE': 'WMS',

2
tests/src/python/test_qgspointclusterrenderer.py
View File

@ -66,7 +66,7 @@ class TestQgsPointClusterRenderer(unittest.TestCase):
self.renderer.setClusterSymbol(QgsMarkerSymbol.createSimple({'color': '#ffff00', 'size': '3', 'outline_style': 'no'}))
self.layer.setRenderer(self.renderer)
rendered_layers = [self.layer.id()]
rendered_layers = [self.layer]
self.mapsettings = QgsMapSettings()
self.mapsettings.setOutputSize(QSize(400, 400))
self.mapsettings.setOutputDpi(96)

2
tests/src/python/test_qgspointdisplacementrenderer.py
View File

@ -71,7 +71,7 @@ class TestQgsPointDisplacementRenderer(unittest.TestCase):
self.renderer.setCenterSymbol(QgsMarkerSymbol.createSimple({'color': '#ffff00', 'size': '3', 'outline_style': 'no'}))
self.layer.setRenderer(self.renderer)
rendered_layers = [self.layer.id()]
rendered_layers = [self.layer]
self.mapsettings = QgsMapSettings()
self.mapsettings.setOutputSize(QSize(400, 400))
self.mapsettings.setOutputDpi(96)

2
tests/src/python/test_qgsrasterlayer.py
View File

@ -135,7 +135,7 @@ class TestQgsRasterLayer(unittest.TestCase):
QgsProject.instance().addMapLayers([myRasterLayer, ])
myMapSettings = QgsMapSettings()
myMapSettings.setLayers([myRasterLayer.id()])
myMapSettings.setLayers([myRasterLayer])
myMapSettings.setExtent(myRasterLayer.extent())
myChecker = QgsRenderChecker()

2
tests/src/python/test_qgsrulebasedrenderer.py
View File

@ -80,7 +80,7 @@ class TestQgsRulebasedRenderer(unittest.TestCase):
self.mapsettings.setOutputDpi(96)
self.mapsettings.setExtent(QgsRectangle(-163, 22, -70, 52))
rendered_layers = [layer.id()]
rendered_layers = [layer]
self.mapsettings.setLayers(rendered_layers)
def tearDown(self):

2
tests/src/python/test_qgssinglesymbolrenderer.py
View File

@ -58,7 +58,7 @@ class TestQgsSingleSymbolRenderer(unittest.TestCase):
self.renderer = QgsSingleSymbolRenderer(sym1)
layer.setRenderer(self.renderer)
rendered_layers = [layer.id()]
rendered_layers = [layer]
self.mapsettings = self.iface.mapCanvas().mapSettings()
self.mapsettings.setOutputSize(QSize(400, 400))
self.mapsettings.setOutputDpi(96)

2
tests/src/python/test_qgssymbolexpressionvariables.py
View File

@ -56,7 +56,7 @@ class TestQgsSymbolExpressionVariables(unittest.TestCase):
QgsProject.instance().addMapLayer(self.layer)
self.iface = get_iface()
rendered_layers = [self.layer.id()]
rendered_layers = [self.layer]
self.mapsettings = self.iface.mapCanvas().mapSettings()
self.mapsettings.setOutputSize(QSize(400, 400))
self.mapsettings.setOutputDpi(96)

6
tests/src/python/test_qgssymbollayer.py
View File

@ -420,7 +420,7 @@ class TestQgsSymbolLayer(unittest.TestCase):
ms.setOutputSize(QSize(400, 400))
ms.setOutputDpi(96)
ms.setExtent(QgsRectangle(-133, 22, -70, 52))
ms.setLayers([polys_layer.id()])
ms.setLayers([polys_layer])
renderchecker = QgsMultiRenderChecker()
renderchecker.setMapSettings(ms)
@ -485,7 +485,7 @@ class TestQgsSymbolLayer(unittest.TestCase):
ms.setOutputSize(QSize(400, 400))
ms.setOutputDpi(96)
ms.setExtent(QgsRectangle(-133, 22, -70, 52))
ms.setLayers([lines_layer.id()])
ms.setLayers([lines_layer])
renderchecker = QgsMultiRenderChecker()
renderchecker.setMapSettings(ms)
@ -549,7 +549,7 @@ class TestQgsSymbolLayer(unittest.TestCase):
ms.setOutputSize(QSize(400, 400))
ms.setOutputDpi(96)
ms.setExtent(QgsRectangle(-133, 22, -70, 52))
ms.setLayers([points_layer.id()])
ms.setLayers([points_layer])
renderchecker = QgsMultiRenderChecker()
renderchecker.setMapSettings(ms)

3
tests/src/python/utilities.py
View File

@ -241,8 +241,7 @@ def mapSettingsString(ms):
s = 'MapSettings...\n'
s += ' layers(): {0}\n'.format(
[QgsProject.instance().mapLayer(i).name()
for i in ms.layers()])
[layer.name() for layer in ms.layers()])
s += ' backgroundColor(): rgba {0},{1},{2},{3}\n'.format(
ms.backgroundColor().red(), ms.backgroundColor().green(),
ms.backgroundColor().blue(), ms.backgroundColor().alpha())