Fix partial labels unit tests and generate new control images

qgis · Feb 21, 2014 · 10f2ac9 · 10f2ac9
1 parent 1d91641
commit 10f2ac9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 25 deletions.
diff --git a/tests/src/python/test_qgspallabeling_tests.py b/tests/src/python/test_qgspallabeling_tests.py
@@ -19,17 +19,21 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from qgis.core import (
+from qgis.core import *
-    QgsPalLayerSettings,
-)
 
 
 class TestPointBase(object):
 
     def __init__(self):
         """Dummy assignments, intended to be overriden in subclasses"""
         self.lyr = QgsPalLayerSettings()
+        """:type: QgsPalLayerSettings"""
         self._TestFont = QApplication.font()  # will become a standard test font
+        self.params = dict()
+        self._Pal = None
+        """:type: QgsPalLabeling"""
+        self._Canvas = None
+        """:type: QgsMapCanvas"""
 
     def checkTest(self, **kwargs):
         """Intended to be overriden in subclasses"""
@@ -55,20 +59,22 @@ def test_text_color(self):
     def test_partials_labels_enabled(self):
         # Set Big font size
         font = QFont(self._TestFont)
-        font.setPointSizeF(90)
+        font.setPointSizeF(120)
         self.lyr.textFont = font
         # Enable partials labels
-        self._PalEngine.setShowingPartialsLabels(True)
+        self._Pal.setShowingPartialsLabels(True)
+        self._Pal.saveEngineSettings()
         # Check
         self.checkTest()
 
     def test_partials_labels_disabled(self):
         # Set Big font size
         font = QFont(self._TestFont)
-        font.setPointSizeF(90)
+        font.setPointSizeF(120)
         self.lyr.textFont = font
         # Disable partials labels
-        self._PalEngine.setShowingPartialsLabels(False)
+        self._Pal.setShowingPartialsLabels(False)
+        self._Pal.saveEngineSettings()
         # Check
         self.checkTest()
 

diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.PNGw b/tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.PNGw
diff --git a/...expected_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled.png b/...expected_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled.png
diff --git a/...s/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled.png b/...s/expected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled.png
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color.PNGw b/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color.PNGw
diff --git a/...tdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.PNGw b/...tdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.PNGw
diff --git a/...expected_pal_server/sp_partials_labels_disabled/sp_partials_labels_disabled.png b/...expected_pal_server/sp_partials_labels_disabled/sp_partials_labels_disabled.png
diff --git a/...s/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled.png b/...s/expected_pal_server/sp_partials_labels_enabled/sp_partials_labels_enabled.png