diff --git a/tests/src/python/test_qgspallabeling_canvas.py b/tests/src/python/test_qgspallabeling_canvas.py index 53d34641c00..3810e09c1ab 100644 --- a/tests/src/python/test_qgspallabeling_canvas.py +++ b/tests/src/python/test_qgspallabeling_canvas.py @@ -31,6 +31,7 @@ from utilities import ( from test_qgspallabeling_base import TestQgsPalLabeling, runSuite from test_qgspallabeling_tests import ( TestPointBase, + TestLineBase, suiteTests ) @@ -114,6 +115,20 @@ class TestCanvasPoint(TestCanvasBasePoint, TestPointBase): super(TestCanvasPoint, self).setUp() self.configTest('pal_canvas', 'sp') +class TestCanvasBaseLine(TestCanvasBase): + + @classmethod + def setUpClass(cls): + TestCanvasBase.setUpClass() + cls.layer = TestQgsPalLabeling.loadFeatureLayer('line') + +class TestCanvasLine(TestCanvasBaseLine, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestCanvasLine, self).setUp() + self.configTest('pal_canvas_line', 'sp') + if __name__ == '__main__': # NOTE: unless PAL_SUITE env var is set all test class methods will be run diff --git a/tests/src/python/test_qgspallabeling_composer.py b/tests/src/python/test_qgspallabeling_composer.py index f1f8a242828..a53a80608e6 100644 --- a/tests/src/python/test_qgspallabeling_composer.py +++ b/tests/src/python/test_qgspallabeling_composer.py @@ -37,6 +37,7 @@ from utilities import ( from test_qgspallabeling_base import TestQgsPalLabeling, runSuite from test_qgspallabeling_tests import ( TestPointBase, + TestLineBase, suiteTests ) @@ -375,6 +376,74 @@ class TestComposerPdfVsComposerPoint(TestComposerPointBase, TestPointBase): self._Mismatch = 50 self._ColorTol = 18 +class TestComposerLineBase(TestComposerBase): + + @classmethod + def setUpClass(cls): + TestComposerBase.setUpClass() + cls.layer = TestQgsPalLabeling.loadFeatureLayer('line') + + +class TestComposerImageLine(TestComposerLineBase, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestComposerImageLine, self).setUp() + self._TestKind = OutputKind.Img + self.configTest('pal_composer_line', 'sp_img') + + +class TestComposerImageVsCanvasLine(TestComposerLineBase, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestComposerImageVsCanvasLine, self).setUp() + self._TestKind = OutputKind.Img + self.configTest('pal_canvas_line', 'sp') + + +class TestComposerSvgLine(TestComposerLineBase, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestComposerSvgLine, self).setUp() + self._TestKind = OutputKind.Svg + self.configTest('pal_composer_line', 'sp_svg') + + +class TestComposerSvgVsComposerLine(TestComposerLineBase, TestLineBase): + """ + Compare only to composer image, which is already compared to canvas line + """ + def setUp(self): + """Run before each test.""" + super(TestComposerSvgVsComposerLine, self).setUp() + self._TestKind = OutputKind.Svg + self.configTest('pal_composer_line', 'sp_img') + self._ColorTol = 4 + + +class TestComposerPdfLine(TestComposerLineBase, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestComposerPdfLine, self).setUp() + self._TestKind = OutputKind.Pdf + self.configTest('pal_composer_line', 'sp_pdf') + + +class TestComposerPdfVsComposerLine(TestComposerLineBase, TestLineBase): + """ + Compare only to composer image, which is already compared to canvas line + """ + def setUp(self): + """Run before each test.""" + super(TestComposerPdfVsComposerLine, self).setUp() + self._TestKind = OutputKind.Pdf + self.configTest('pal_composer_line', 'sp_img') + self._Mismatch = 50 + self._ColorTol = 18 + if __name__ == '__main__': # NOTE: unless PAL_SUITE env var is set all test class methods will be run diff --git a/tests/src/python/test_qgspallabeling_server.py b/tests/src/python/test_qgspallabeling_server.py index b1bbf597ac8..d2dfd3c0ed3 100644 --- a/tests/src/python/test_qgspallabeling_server.py +++ b/tests/src/python/test_qgspallabeling_server.py @@ -34,6 +34,7 @@ from qgis_local_server import getLocalServer from test_qgspallabeling_base import TestQgsPalLabeling, runSuite from test_qgspallabeling_tests import ( TestPointBase, + TestLineBase, suiteTests ) @@ -212,6 +213,25 @@ class TestServerVsCanvasPoint(TestServerBasePoint, TestPointBase): super(TestServerVsCanvasPoint, self).setUp() self.configTest('pal_canvas', 'sp') +class TestServerBaseLine(TestServerBase): + + @classmethod + def setUpClass(cls): + TestServerBase.setUpClass() + cls.layer = TestQgsPalLabeling.loadFeatureLayer('line') + +class TestServerLine(TestServerBaseLine, TestLineBase): + + def setUp(self): + """Run before each test.""" + super(TestServerLine, self).setUp() + self.configTest('pal_server_line', 'sp') + +class TestServerVsCanvasLine(TestServerBaseLine, TestLineBase): + + def setUp(self): + super(TestServerVsCanvasLine, self).setUp() + self.configTest('pal_canvas_line', 'sp') if __name__ == '__main__': # NOTE: unless PAL_SUITE env var is set all test class methods will be run diff --git a/tests/src/python/test_qgspallabeling_tests.py b/tests/src/python/test_qgspallabeling_tests.py index 57e620f1044..1400e657338 100644 --- a/tests/src/python/test_qgspallabeling_tests.py +++ b/tests/src/python/test_qgspallabeling_tests.py @@ -170,19 +170,96 @@ class TestPointBase(object): self._Pal.setShowingPartialsLabels(False) self._Pal.saveEngineSettings() self.checkTest() - + def test_buffer(self): # Label with buffer self.lyr.bufferDraw = True self.lyr.bufferSize = 2 - self.checkTest() + self.checkTest() def test_shadow(self): # Label with shadow self.lyr.shadowDraw = True self.lyr.shadowOffsetDist = 2 self.lyr.shadowTransparency = 0 - self.checkTest() + self.checkTest() + +# noinspection PyPep8Naming +class TestLineBase(object): + + def __init__(self): + """Dummy assignments, intended to be overridden in subclasses""" + self.lyr = QgsPalLayerSettings() + """:type: QgsPalLayerSettings""" + # noinspection PyArgumentList + self._TestFont = QFont() # will become a standard test font + self._Pal = None + """:type: QgsPalLabeling""" + self._Canvas = None + """:type: QgsMapCanvas""" + # custom mismatches per group/test (should not mask any needed anomaly) + # e.g. self._Mismatches['TestClassName'] = 300 + # check base output class's checkTest() or sublcasses for any defaults + self._Mismatches = dict() + # custom color tolerances per group/test: 1 - 20 (0 default, 20 max) + # (should not mask any needed anomaly) + # e.g. self._ColorTols['TestClassName'] = 10 + # check base output class's checkTest() or sublcasses for any defaults + self._ColorTols = dict() + + # noinspection PyMethodMayBeStatic + def checkTest(self, **kwargs): + """Intended to be overridden in subclasses""" + pass + + def test_line_placement_above_line_orientation(self): + # Line placement, above, follow line orientation + self.lyr.placement = QgsPalLayerSettings.Line + self.lyr.placementFlags = QgsPalLayerSettings.AboveLine + self.checkTest() + + def test_line_placement_online(self): + # Line placement, on line + self.lyr.placement = QgsPalLayerSettings.Line + self.lyr.placementFlags = QgsPalLayerSettings.OnLine + self.checkTest() + + def test_line_placement_below_line_orientation(self): + # Line placement, below, follow line orientation + self.lyr.placement = QgsPalLayerSettings.Line + self.lyr.placementFlags = QgsPalLayerSettings.BelowLine + self.checkTest() + + def test_line_placement_above_map_orientation(self): + # Line placement, above, follow map orientation + self.lyr.placement = QgsPalLayerSettings.Line + self.lyr.placementFlags = QgsPalLayerSettings.AboveLine | QgsPalLayerSettings.MapOrientation + self.checkTest() + + def test_line_placement_below_map_orientation(self): + # Line placement, below, follow map orientation + self.lyr.placement = QgsPalLayerSettings.Line + self.lyr.placementFlags = QgsPalLayerSettings.BelowLine | QgsPalLayerSettings.MapOrientation + self.checkTest() + + def test_curved_placement_online(self): + # Curved placement, on line + self.lyr.placement = QgsPalLayerSettings.Curved + self.lyr.placementFlags = QgsPalLayerSettings.OnLine + self.checkTest() + + def test_curved_placement_above(self): + # Curved placement, on line + self.lyr.placement = QgsPalLayerSettings.Curved + self.lyr.placementFlags = QgsPalLayerSettings.AboveLine | QgsPalLayerSettings.MapOrientation + self.checkTest() + + def test_curved_placement_below(self): + # Curved placement, on line + self.lyr.placement = QgsPalLayerSettings.Curved + self.lyr.placementFlags = QgsPalLayerSettings.BelowLine | QgsPalLayerSettings.MapOrientation + self.checkTest() + # noinspection PyPep8Naming def suiteTests(): diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above.png new file mode 100644 index 00000000000..21957366fdb Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below.png new file mode 100644 index 00000000000..d46334bc024 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online.png new file mode 100644 index 00000000000..603b97df438 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_online/sp_line_placement_online.png b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_online/sp_line_placement_online.png new file mode 100644 index 00000000000..449ae4dbf65 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_canvas_line/sp_line_placement_online/sp_line_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above.png new file mode 100644 index 00000000000..21957366fdb Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png new file mode 100644 index 00000000000..cb6ba6ee62d Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below.png new file mode 100644 index 00000000000..d46334bc024 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png new file mode 100644 index 00000000000..47e13eb324e Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online.png new file mode 100644 index 00000000000..603b97df438 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png new file mode 100644 index 00000000000..560e9aebaaf Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png new file mode 100644 index 00000000000..927ee0c86cf Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png new file mode 100644 index 00000000000..927ee0c86cf Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png new file mode 100644 index 00000000000..560e9aebaaf Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_online/sp_img_line_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_online/sp_img_line_placement_online.png new file mode 100644 index 00000000000..449ae4dbf65 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_online/sp_img_line_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above.png new file mode 100644 index 00000000000..41d79d11849 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below.png new file mode 100644 index 00000000000..67d81986766 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online.png new file mode 100644 index 00000000000..97537ec855a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_line_orientation/sp_pdf_line_placement_above_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_line_orientation/sp_pdf_line_placement_above_line_orientation.png new file mode 100644 index 00000000000..62394fa8e6d Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_line_orientation/sp_pdf_line_placement_above_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_map_orientation/sp_pdf_line_placement_above_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_map_orientation/sp_pdf_line_placement_above_map_orientation.png new file mode 100644 index 00000000000..870d68098b1 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_map_orientation/sp_pdf_line_placement_above_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_line_orientation/sp_pdf_line_placement_below_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_line_orientation/sp_pdf_line_placement_below_line_orientation.png new file mode 100644 index 00000000000..870d68098b1 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_line_orientation/sp_pdf_line_placement_below_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_map_orientation/sp_pdf_line_placement_below_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_map_orientation/sp_pdf_line_placement_below_map_orientation.png new file mode 100644 index 00000000000..62394fa8e6d Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_map_orientation/sp_pdf_line_placement_below_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online.png new file mode 100644 index 00000000000..203181b9141 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above.png new file mode 100644 index 00000000000..a9742f39ad7 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below.png new file mode 100644 index 00000000000..2a7f37172c5 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online.png new file mode 100644 index 00000000000..41174053ad3 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_line_orientation/sp_svg_line_placement_above_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_line_orientation/sp_svg_line_placement_above_line_orientation.png new file mode 100644 index 00000000000..30e13a5239e Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_line_orientation/sp_svg_line_placement_above_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_map_orientation/sp_svg_line_placement_above_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_map_orientation/sp_svg_line_placement_above_map_orientation.png new file mode 100644 index 00000000000..e9f18833ac4 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_above_map_orientation/sp_svg_line_placement_above_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_line_orientation/sp_svg_line_placement_below_line_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_line_orientation/sp_svg_line_placement_below_line_orientation.png new file mode 100644 index 00000000000..e9f18833ac4 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_line_orientation/sp_svg_line_placement_below_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_map_orientation/sp_svg_line_placement_below_map_orientation.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_map_orientation/sp_svg_line_placement_below_map_orientation.png new file mode 100644 index 00000000000..30e13a5239e Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_below_map_orientation/sp_svg_line_placement_below_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_online/sp_svg_line_placement_online.png b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_online/sp_svg_line_placement_online.png new file mode 100644 index 00000000000..efdbefdde60 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_composer_line/sp_svg_line_placement_online/sp_svg_line_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_above/sp_curved_placement_above.png b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_above/sp_curved_placement_above.png new file mode 100644 index 00000000000..21957366fdb Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_above/sp_curved_placement_above.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_below/sp_curved_placement_below.png b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_below/sp_curved_placement_below.png new file mode 100644 index 00000000000..d46334bc024 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_below/sp_curved_placement_below.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_online/sp_curved_placement_online.png b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_online/sp_curved_placement_online.png new file mode 100644 index 00000000000..603b97df438 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_curved_placement_online/sp_curved_placement_online.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_line_orientation/sp_line_placement_above_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_above_map_orientation/sp_line_placement_above_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png new file mode 100644 index 00000000000..061bd3a9fb6 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_line_orientation/sp_line_placement_below_line_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png new file mode 100644 index 00000000000..9b196286f3a Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_below_map_orientation/sp_line_placement_below_map_orientation.png differ diff --git a/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_online/sp_line_placement_online.png b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_online/sp_line_placement_online.png new file mode 100644 index 00000000000..449ae4dbf65 Binary files /dev/null and b/tests/testdata/control_images/expected_pal_server_line/sp_line_placement_online/sp_line_placement_online.png differ diff --git a/tests/testdata/labeling/line.qml b/tests/testdata/labeling/line.qml new file mode 100644 index 00000000000..402e9b4d056 --- /dev/null +++ b/tests/testdata/labeling/line.qml @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + pkuid + + + + + + + + + + + + 0 + + generatedlayout + + + + diff --git a/tests/testdata/labeling/pal_features_v3.sqlite b/tests/testdata/labeling/pal_features_v3.sqlite index cf76eb737ca..3fdc3f0be61 100644 Binary files a/tests/testdata/labeling/pal_features_v3.sqlite and b/tests/testdata/labeling/pal_features_v3.sqlite differ