[Server] Fonts used in GetLegendGraphics tests are bolded and increased

qgis · Jun 9, 2017 · 7b84483 · 7b84483
1 parent c1657ac
commit 7b84483
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 5 deletions.
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -39,7 +39,7 @@
 
 from io import StringIO
 from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse
-from qgis.core import QgsRenderChecker, QgsApplication
+from qgis.core import QgsRenderChecker, QgsApplication, QgsFontUtils
 from qgis.testing import unittest
 from qgis.PyQt.QtCore import QSize
 from utilities import unitTestDataPath
@@ -94,6 +94,9 @@ def tearDownClass(cls):
 
     def setUp(self):
         """Create the server instance"""
+        self.fontFamily = QgsFontUtils.standardTestFontFamily()
+        QgsFontUtils.loadStandardTestFonts(['All'])
+
         self.testdata_path = unitTestDataPath('qgis_server') + '/'
 
         d = unitTestDataPath('qgis_server_accesscontrol') + '/'

diff --git a/tests/src/python/test_qgsserver_wms.py b/tests/src/python/test_qgsserver_wms.py
@@ -1059,6 +1059,12 @@ def test_wms_GetLegendGraphic_LayerSpace(self):
             # "HEIGHT": "500",
             # "WIDTH": "500",
             "LAYERSPACE": "50.0",
+            "LAYERFONTBOLD": "TRUE",
+            "LAYERFONTSIZE": "30",
+            "ITEMFONTBOLD": "TRUE",
+            "ITEMFONTSIZE": "20",
+            "LAYERFONTFAMILY": self.fontFamily,
+            "ITEMFONTFAMILY": self.fontFamily,
             "LAYERTITLE": "TRUE",
             "CRS": "EPSG:3857"
         }.items())])
@@ -1077,15 +1083,24 @@ def test_wms_GetLegendGraphic_ShowFeatureCount(self):
             # "HEIGHT": "500",
             # "WIDTH": "500",
             "LAYERTITLE": "TRUE",
+            "LAYERFONTBOLD": "TRUE",
+            "LAYERFONTSIZE": "30",
+            "LAYERFONTFAMILY": self.fontFamily,
+            "ITEMFONTFAMILY": self.fontFamily,
+            "ITEMFONTBOLD": "TRUE",
+            "ITEMFONTSIZE": "20",
             "SHOWFEATURECOUNT": "TRUE",
             "CRS": "EPSG:3857"
         }.items())])
 
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_ShowFeatureCount")
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_ShowFeatureCount", max_size_diff=QSize(1, 1))
 
     def test_getLegendGraphics_layertitle(self):
         """Test that does not return an exception but an image"""
+
+        print("TEST FONT FAMILY: ", self.fontFamily)
+
         parms = {
             'MAP': self.testdata_path + "test_project.qgs",
             'SERVICE': 'WMS',
@@ -1095,6 +1110,12 @@ def test_getLegendGraphics_layertitle(self):
             # 'WIDTH': '20', # optional
             # 'HEIGHT': '20', # optional
             'LAYER': u'testlayer%20èé',
+            'LAYERFONTBOLD': 'TRUE',
+            'LAYERFONTSIZE': '30',
+            'ITEMFONTBOLD': 'TRUE',
+            'LAYERFONTFAMILY': self.fontFamily,
+            'ITEMFONTFAMILY': self.fontFamily,
+            'ITEMFONTSIZE': '20',
             'LAYERTITLE': 'TRUE',
         }
         qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()])
@@ -1125,6 +1146,12 @@ def test_getLegendGraphics_rulelabel(self):
             'REQUEST': 'GetLegendGraphic',
             'FORMAT': 'image/png',
             'LAYER': u'testlayer%20èé',
+            'LAYERFONTBOLD': 'TRUE',
+            'LAYERFONTSIZE': '30',
+            'LAYERFONTFAMILY': self.fontFamily,
+            'ITEMFONTFAMILY': self.fontFamily,
+            'ITEMFONTBOLD': 'TRUE',
+            'ITEMFONTSIZE': '20',
             'RULELABEL': 'TRUE',
         }
         qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()])
@@ -1138,6 +1165,12 @@ def test_getLegendGraphics_rulelabel(self):
             'REQUEST': 'GetLegendGraphic',
             'FORMAT': 'image/png',
             'LAYER': u'testlayer%20èé',
+            'LAYERFONTBOLD': 'TRUE',
+            'LAYERFONTSIZE': '30',
+            'ITEMFONTBOLD': 'TRUE',
+            'ITEMFONTSIZE': '20',
+            'LAYERFONTFAMILY': self.fontFamily,
+            'ITEMFONTFAMILY': self.fontFamily,
             'RULELABEL': 'FALSE',
         }
         qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()])
@@ -1330,14 +1363,18 @@ def test_wms_GetLegendGraphic_LayerFont(self):
             "LAYERFONTBOLD": "TRUE",
             "LAYERFONTITALIC": "TRUE",
             "LAYERFONTSIZE": "30",
+            "ITEMFONTBOLD": "TRUE",
+            "ITEMFONTSIZE": "20",
+            "LAYERFONTFAMILY": self.fontFamily,
+            "ITEMFONTFAMILY": self.fontFamily,
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
             "CRS": "EPSG:3857"
         }.items())])
 
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_LayerFont")
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_LayerFont", max_size_diff=QSize(1, 1))
 
     def test_wms_GetLegendGraphic_ItemFont(self):
         qs = "?" + "&".join(["%s=%s" % i for i in list({
@@ -1347,17 +1384,21 @@ def test_wms_GetLegendGraphic_ItemFont(self):
             "REQUEST": "GetLegendGraphic",
             "LAYER": "Country,Hello",
             "LAYERTITLE": "TRUE",
+            "LAYERFONTBOLD": "TRUE",
+            "LAYERFONTSIZE": "30",
             "ITEMFONTBOLD": "TRUE",
             "ITEMFONTITALIC": "TRUE",
-            "ITEMFONTSIZE": "30",
+            "ITEMFONTSIZE": "20",
+            "LAYERFONTFAMILY": self.fontFamily,
+            "ITEMFONTFAMILY": self.fontFamily,
             "FORMAT": "image/png",
             "HEIGHT": "500",
             "WIDTH": "500",
             "CRS": "EPSG:3857"
         }.items())])
 
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_ItemFont")
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_ItemFont", max_size_diff=QSize(1, 1))
 
     def test_wms_GetLegendGraphic_BBox(self):
         qs = "?" + "&".join(["%s=%s" % i for i in list({

diff --git a/...ges/qgis_server/WMS_GetLegendGraphic_ItemFont/WMS_GetLegendGraphic_ItemFont.png b/...ges/qgis_server/WMS_GetLegendGraphic_ItemFont/WMS_GetLegendGraphic_ItemFont.png
diff --git a/...gis_server/WMS_GetLegendGraphic_ItemFont/WMS_GetLegendGraphic_ItemFont_mask.png b/...gis_server/WMS_GetLegendGraphic_ItemFont/WMS_GetLegendGraphic_ItemFont_mask.png
diff --git a/...s/qgis_server/WMS_GetLegendGraphic_LayerFont/WMS_GetLegendGraphic_LayerFont.png b/...s/qgis_server/WMS_GetLegendGraphic_LayerFont/WMS_GetLegendGraphic_LayerFont.png
diff --git a/...s_server/WMS_GetLegendGraphic_LayerFont/WMS_GetLegendGraphic_LayerFont_mask.png b/...s_server/WMS_GetLegendGraphic_LayerFont/WMS_GetLegendGraphic_LayerFont_mask.png
diff --git a/...qgis_server/WMS_GetLegendGraphic_LayerSpace/WMS_GetLegendGraphic_LayerSpace.png b/...qgis_server/WMS_GetLegendGraphic_LayerSpace/WMS_GetLegendGraphic_LayerSpace.png
diff --git a/...server/WMS_GetLegendGraphic_LayerSpace/WMS_GetLegendGraphic_LayerSpace_mask.png b/...server/WMS_GetLegendGraphic_LayerSpace/WMS_GetLegendGraphic_LayerSpace_mask.png
diff --git a/...WMS_GetLegendGraphic_ShowFeatureCount/WMS_GetLegendGraphic_ShowFeatureCount.png b/...WMS_GetLegendGraphic_ShowFeatureCount/WMS_GetLegendGraphic_ShowFeatureCount.png
diff --git a/...etLegendGraphic_ShowFeatureCount/WMS_GetLegendGraphic_ShowFeatureCount_mask.png b/...etLegendGraphic_ShowFeatureCount/WMS_GetLegendGraphic_ShowFeatureCount_mask.png
diff --git a/...r/WMS_GetLegendGraphic_rulelabel_false/WMS_GetLegendGraphic_rulelabel_false.png b/...r/WMS_GetLegendGraphic_rulelabel_false/WMS_GetLegendGraphic_rulelabel_false.png
diff --git a/..._GetLegendGraphic_rulelabel_false/WMS_GetLegendGraphic_rulelabel_false_mask.png b/..._GetLegendGraphic_rulelabel_false/WMS_GetLegendGraphic_rulelabel_false_mask.png
diff --git a/...trol_images/qgis_server/WMS_GetLegendGraphic_test/WMS_GetLegendGraphic_test.png b/...trol_images/qgis_server/WMS_GetLegendGraphic_test/WMS_GetLegendGraphic_test.png
diff --git a/...images/qgis_server/WMS_GetLegendGraphic_test/WMS_GetLegendGraphic_test_mask.png b/...images/qgis_server/WMS_GetLegendGraphic_test/WMS_GetLegendGraphic_test_mask.png