Rebuild labeling tests control images with smaller size (420 x 280)

qgis · Mar 25, 2014 · db4401f · db4401f
1 parent 90f012d
commit db4401f
Show file tree

Hide file tree

Showing 40 changed files with 7 additions and 11 deletions.
diff --git a/tests/src/python/test_qgspallabeling_base.py b/tests/src/python/test_qgspallabeling_base.py
@@ -208,7 +208,7 @@ def getBaseMapSettings(cls):
         # default for labeling test data: WGS 84 / UTM zone 13N
         crs.createFromSrid(32613)
         ms.setBackgroundColor(QColor(152, 219, 249))
-        ms.setOutputSize(QSize(600, 400))
+        ms.setOutputSize(QSize(420, 280))
         ms.setOutputDpi(72)
         ms.setFlag(QgsMapSettings.Antialiasing)
         ms.setDestinationCrs(crs)
@@ -258,7 +258,7 @@ def defaultLayerSettings(self):
         lyr.enabled = True
         lyr.fieldName = 'text'  # default in test data sources
         font = self.getTestFont()
-        font.setPointSize(48)
+        font.setPointSize(32)
         lyr.textFont = font
         lyr.textNamedStyle = 'Roman'
         return lyr

diff --git a/tests/src/python/test_qgspallabeling_composer.py b/tests/src/python/test_qgspallabeling_composer.py
@@ -264,7 +264,7 @@ def checkTest(self, **kwargs):
         mismatch = 0
         if 'PAL_NO_MISMATCH' not in os.environ:
             # some mismatch expected
-            mismatch = self._Mismatch if self._Mismatch else 200
+            mismatch = self._Mismatch if self._Mismatch else 20
             if self._TestGroup in self._Mismatches:
                 mismatch = self._Mismatches[self._TestGroup]
         colortol = 0
@@ -320,6 +320,7 @@ def setUp(self):
         super(TestComposerSvgVsComposerPoint, self).setUp()
         self._TestKind = OutputKind.Svg
         self.configTest('pal_composer', 'sp_img')
+        self._Mismatch = 350
 
 
 if __name__ == '__main__':

diff --git a/tests/src/python/test_qgspallabeling_server.py b/tests/src/python/test_qgspallabeling_server.py
@@ -167,7 +167,7 @@ def checkTest(self, **kwargs):
         mismatch = 0
         if 'PAL_NO_MISMATCH' not in os.environ:
             # some mismatch expected
-            mismatch = self._Mismatch if self._Mismatch else 50
+            mismatch = self._Mismatch if self._Mismatch else 20
             if self._TestGroup in self._Mismatches:
                 mismatch = self._Mismatches[self._TestGroup]
         colortol = 0

diff --git a/tests/src/python/test_qgspallabeling_tests.py b/tests/src/python/test_qgspallabeling_tests.py
@@ -56,7 +56,6 @@ def checkTest(self, **kwargs):
 
     def test_default_label(self):
         # Default label placement, with text size in points
-        self._Mismatches['TestComposerSvgVsComposerPoint'] = 500
         self.checkTest()
 
     def test_text_size_map_unit(self):
@@ -70,12 +69,10 @@ def test_text_size_map_unit(self):
     def test_text_color(self):
         # Label color change
         self.lyr.textColor = Qt.blue
-        self._Mismatches['TestComposerSvgVsComposerPoint'] = 500
         self.checkTest()
 
     def test_background_rect(self):
         self.lyr.shapeDraw = True
-        self._Mismatches['TestComposerSvgVsComposerPoint'] = 1100
         self.checkTest()
 
     def test_background_rect_w_offset(self):
@@ -91,7 +88,6 @@ def test_background_rect_w_offset(self):
         self.lyr.shapeDraw = True
         self.lyr.shapeOffsetUnits = QgsPalLayerSettings.MapUnits
         self.lyr.shapeOffset = QPointF(-2900.0, -450.0)
-        self._Mismatches['TestComposerSvgVsComposerPoint'] = 750
         self.checkTest()
 
     def test_background_svg(self):
@@ -134,18 +130,17 @@ def test_background_svg_w_offset(self):
     def test_partials_labels_enabled(self):
         # Set Big font size
         font = QFont(self._TestFont)
-        font.setPointSizeF(120)
+        font.setPointSizeF(84)
         self.lyr.textFont = font
         # Enable partials labels
         self._Pal.setShowingPartialsLabels(True)
         self._Pal.saveEngineSettings()
-        self._Mismatches['TestComposerSvgVsComposerPoint'] = 600
         self.checkTest()
 
     def test_partials_labels_disabled(self):
         # Set Big font size
         font = QFont(self._TestFont)
-        font.setPointSizeF(120)
+        font.setPointSizeF(84)
         self.lyr.textFont = font
         # Disable partials labels
         self._Pal.setShowingPartialsLabels(False)

diff --git a/...ta/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect.png b/...ta/control_images/expected_pal_canvas/sp_background_rect/sp_background_rect.png
diff --git a/...expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset.png b/...expected_pal_canvas/sp_background_rect_w_offset/sp_background_rect_w_offset.png
diff --git a/...data/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg.png b/...data/control_images/expected_pal_canvas/sp_background_svg/sp_background_svg.png
diff --git a/...s/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset.png b/...s/expected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset.png
diff --git a/...stdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.png b/...stdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.png
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.png b/tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color.png
diff --git a/...trol_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.png b/...trol_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.png
diff --git a/..._images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect.png b/..._images/expected_pal_composer/sp_img_background_rect/sp_img_background_rect.png
diff --git a/...al_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset.png b/...al_composer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset.png
diff --git a/...ol_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg.png b/...ol_images/expected_pal_composer/sp_img_background_svg/sp_img_background_svg.png
diff --git a/..._pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset.png b/..._pal_composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset.png
diff --git a/...trol_images/expected_pal_composer/sp_img_default_label/sp_img_default_label.png b/...trol_images/expected_pal_composer/sp_img_default_label/sp_img_default_label.png
diff --git a/...al_composer/sp_img_partials_labels_disabled/sp_img_partials_labels_disabled.png b/...al_composer/sp_img_partials_labels_disabled/sp_img_partials_labels_disabled.png
diff --git a/..._pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled.png b/..._pal_composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled.png
diff --git a/...ta/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color.png b/...ta/control_images/expected_pal_composer/sp_img_text_color/sp_img_text_color.png
diff --git a/...s/expected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit.png b/...s/expected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit.png
diff --git a/..._images/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect.png b/..._images/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect.png
diff --git a/...al_composer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset.png b/...al_composer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset.png
diff --git a/...ol_images/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg.png b/...ol_images/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg.png
diff --git a/..._pal_composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset.png b/..._pal_composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset.png
diff --git a/...trol_images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label.png b/...trol_images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label.png
diff --git a/...al_composer/sp_svg_partials_labels_disabled/sp_svg_partials_labels_disabled.png b/...al_composer/sp_svg_partials_labels_disabled/sp_svg_partials_labels_disabled.png
diff --git a/..._pal_composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled.png b/..._pal_composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled.png
diff --git a/...ta/control_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color.png b/...ta/control_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color.png
diff --git a/...s/expected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit.png b/...s/expected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit.png
diff --git a/...ta/control_images/expected_pal_server/sp_background_rect/sp_background_rect.png b/...ta/control_images/expected_pal_server/sp_background_rect/sp_background_rect.png
diff --git a/...expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset.png b/...expected_pal_server/sp_background_rect_w_offset/sp_background_rect_w_offset.png
diff --git a/...data/control_images/expected_pal_server/sp_background_svg/sp_background_svg.png b/...data/control_images/expected_pal_server/sp_background_svg/sp_background_svg.png
diff --git a/...s/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset.png b/...s/expected_pal_server/sp_background_svg_w_offset/sp_background_svg_w_offset.png
diff --git a/...stdata/control_images/expected_pal_server/sp_default_label/sp_default_label.png b/...stdata/control_images/expected_pal_server/sp_default_label/sp_default_label.png
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
diff --git a/tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color.png b/tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color.png
diff --git a/...trol_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit.png b/...trol_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit.png