Port pal composer test to labels

qgis · Jan 8, 2018 · b88f9b5 · b88f9b5
1 parent d372799
commit b88f9b5
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 79 deletions.
diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
@@ -119,7 +119,7 @@ ADD_PYTHON_TEST(PyQgsOptional test_qgsoptional.py)
 ADD_PYTHON_TEST(PyQgsOwsConnection test_qgsowsconnection.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingBase test_qgspallabeling_base.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingCanvas test_qgspallabeling_canvas.py)
-ADD_PYTHON_TEST(PyQgsPalLabelingComposer test_qgspallabeling_composer.py)
+ADD_PYTHON_TEST(PyQgsPalLabelingLayout test_qgspallabeling_layout.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingPlacement test_qgspallabeling_placement.py)
 ADD_PYTHON_TEST(PyQgsPanelWidget test_qgspanelwidget.py)
 ADD_PYTHON_TEST(PyQgsPanelWidgetStack test_qgspanelwidgetstack.py)

diff --git a/tests/src/python/test_qgslayoutatlas.py b/tests/src/python/test_qgslayoutatlas.py
@@ -85,7 +85,7 @@ def testCase(self):
         QgsProject.instance().addMapLayers([mVectorLayer])
         self.layers = [mVectorLayer]
 
-        # create composition with composer map
+        # create layout with layout map
 
         # select epsg:2154
         crs = QgsCoordinateReferenceSystem()
@@ -576,7 +576,7 @@ def rotation_test(self):
         polygonLayer.dataProvider().addFeatures([poly])
         QgsProject.instance().addMapLayer(polygonLayer)
 
-        # Recreating the composer locally
+        # Recreating the layout locally
         composition = QgsPrintLayout(QgsProject.instance())
         composition.initializeDefaults()
 

diff --git a/tests/src/python/test_qgslayoutmap.py b/tests/src/python/test_qgslayoutmap.py
@@ -75,7 +75,7 @@ def __init__(self, methodName):
         # assert pipe.set(rasterRenderer), 'Cannot set pipe renderer'
         QgsProject.instance().addMapLayers([self.raster_layer, self.vector_layer])
 
-        # create composition with composer map
+        # create layout with layout map
         self.layout = QgsLayout(QgsProject.instance())
         self.layout.initializeDefaults()
         self.map = QgsLayoutItemMap(self.layout)
@@ -166,7 +166,7 @@ def testOverviewMapCenter(self):
         assert myTestResult, myMessage
 
     def testMapCrs(self):
-        # create composition with composer map
+        # create layout with layout map
         map_settings = QgsMapSettings()
         map_settings.setLayers([self.vector_layer])
         layout = QgsLayout(QgsProject.instance())