Use QgsLayoutChecker from core

qgis · May 9, 2023 · da075fa · da075fa
1 parent 87d3501
commit da075fa
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 75 deletions.
diff --git a/python/testing/__init__.py b/python/testing/__init__.py
@@ -51,9 +51,9 @@
     QgsRenderChecker,
     QgsMultiRenderChecker,
     QgsMapSettings,
-    QgsLayout
+    QgsLayout,
+    QgsLayoutChecker
 )
-from qgslayoutchecker import QgsLayoutChecker
 
 import unittest
 

diff --git a/tests/src/python/qgslayoutchecker.py b/tests/src/python/qgslayoutchecker.py
diff --git a/tests/src/python/test_qgslayoutatlas.py b/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()

diff --git a/tests/src/python/test_qgslayoutelevationprofile.py b/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
 

diff --git a/tests/src/python/test_qgslayouthtml.py b/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()

diff --git a/tests/src/python/test_qgslayoutlegend.py b/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
 

diff --git a/tests/src/python/test_qgslayoutmap.py b/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
 

diff --git a/tests/src/python/test_qgslayoutmapgrid.py b/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()

diff --git a/tests/src/python/test_qgslayoutmapoverview.py b/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
 

diff --git a/tests/src/python/test_qgslayoutmarker.py b/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
 

diff --git a/tests/src/python/test_qgslayoutpicture.py b/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
 

diff --git a/tests/src/python/test_qgslayoutpolygon.py b/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
 

diff --git a/tests/src/python/test_qgslayoutpolyline.py b/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
 

diff --git a/tests/src/python/test_qgsmaphittest.py b/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