Merge pull request #53053 from m-kuhn/intsall_qgslayoutchecker

python/testing/__init__.py

@@ -51,9 +51,9 @@
     QgsRenderChecker,
     QgsMultiRenderChecker,
     QgsMapSettings,
-    QgsLayout
+    QgsLayout,
+    QgsLayoutChecker,
 )
-from qgslayoutchecker import QgsLayoutChecker
 
 import unittest
 
@@ -156,14 +156,9 @@ def render_map_settings_check(cls,
         return result
 
     @classmethod
-    def render_layout_check(cls,
-                            name: str,
-                            layout: QgsLayout,
-                            size: QSize,
-                            dpi: Optional[float] = 192) -> bool:
+    def render_layout_check(cls, name: str, layout: QgsLayout, size: QSize):
         checker = QgsLayoutChecker(name, layout)
-        checker.dots_per_meter = dpi / 25.4 * 1000
-        checker.size = size
+        checker.setSize(size)
         if cls.control_path_prefix():
             checker.setControlPathPrefix(cls.control_path_prefix())
         result, message = checker.testLayout()

tests/src/python/test_qgsannotation.py

@@ -309,8 +309,7 @@ def renderAnnotationInLayout(self, test_name, annotation):
         return self.render_layout_check(
             test_name,
             layout=l,
-            size=QSize(1122 * 2, 794 * 2),
-            dpi=192
+            size=QSize(1122 * 2, 794 * 2)
         )
 
 

tests/src/python/test_qgslayoutatlas.py

@@ -27,6 +27,7 @@
     QgsGeometry,
     QgsLayoutItemLabel,
     QgsLayoutItemLegend,
+    QgsLayoutChecker,
     QgsLayoutItemMap,
     QgsLayoutObject,
     QgsLayoutPoint,
@@ -44,7 +45,7 @@
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
+
 from utilities import unitTestDataPath
 
 start_app()

tests/src/python/test_qgslayoutelevationprofile.py

@@ -32,10 +32,10 @@
     QgsRasterLayer,
     QgsTextFormat,
     QgsVectorLayer,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayouthtml.py

@@ -19,11 +19,11 @@
     QgsLayoutItemHtml,
     QgsLayoutMultiFrame,
     QgsProject,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 from qgis.testing.mocked import get_iface
 
-from qgslayoutchecker import QgsLayoutChecker
 from utilities import unitTestDataPath
 
 start_app()

tests/src/python/test_qgslayoutlegend.py

@@ -46,11 +46,11 @@
     QgsVectorLayer,
     QgsReadWriteContext,
     QgsFeature,
-    QgsGeometry
+    QgsGeometry,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutmap.py

@@ -45,6 +45,7 @@
     QgsProperty,
     QgsRasterLayer,
     QgsReadWriteContext,
+    QgsLayoutChecker,
     QgsRectangle,
     QgsSingleSymbolRenderer,
     QgsTextFormat,
@@ -54,7 +55,6 @@
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutmapgrid.py

@@ -23,10 +23,10 @@
     QgsProperty,
     QgsRectangle,
     QgsTextFormat,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from utilities import getTestFont, unitTestDataPath
 
 start_app()

tests/src/python/test_qgslayoutmapoverview.py

@@ -32,10 +32,10 @@
     QgsSingleSymbolRenderer,
     QgsSymbolLayer,
     QgsVectorLayer,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutmarker.py

@@ -25,10 +25,10 @@
     QgsReadWriteContext,
     QgsRectangle,
     QgsUnitTypes,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutpicture.py

@@ -26,10 +26,10 @@
     QgsProject,
     QgsReadWriteContext,
     QgsRectangle,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutpolygon.py

@@ -24,10 +24,10 @@
     QgsLayoutUtils,
     QgsProject,
     QgsReadWriteContext,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgslayoutpolyline.py

@@ -20,10 +20,10 @@
     QgsLineSymbol,
     QgsProject,
     QgsReadWriteContext,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
 
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath
 

tests/src/python/test_qgsmaphittest.py

@@ -32,10 +32,10 @@
     QgsApplication,
     QgsVectorLayer,
     QgsMapHitTestTask,
-    QgsLayerTreeFilterSettings
+    QgsLayerTreeFilterSettings,
+    QgsLayoutChecker
 )
 from qgis.testing import start_app, unittest
-from qgslayoutchecker import QgsLayoutChecker
 from test_qgslayoutitem import LayoutItemTestCase
 from utilities import unitTestDataPath