Revert test for rulelabel not set, add new rulelabel=auto test, clean…

… data from previous commits
qgis · May 12, 2020 · c79a40f · c79a40f
1 parent f957b9f
commit c79a40f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/tests/src/python/test_qgsserver_wms_getlegendgraphic.py b/tests/src/python/test_qgsserver_wms_getlegendgraphic.py
@@ -260,37 +260,40 @@ def test_wms_getLegendGraphics_rulelabel(self):
         r, h = self._result(self._execute_request(qs))
         self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_true", 250, QSize(15, 15))
 
-        # LAYERTITLE false and no set of RULELABEL means it is false for single symbol
+        # no set of RULELABEL means it is true
         parms = {
             'MAP': self.testdata_path + "test_project.qgs",
             'SERVICE': 'WMS',
             'VERSION': '1.3.0',
             'REQUEST': 'GetLegendGraphic',
             'FORMAT': 'image/png',
             'LAYER': u'testlayer%20èé',
+            'LAYERFONTBOLD': 'TRUE',
+            'LAYERFONTSIZE': '30',
+            'ITEMFONTBOLD': 'TRUE',
+            'ITEMFONTSIZE': '20',
+            'LAYERFONTFAMILY': self.fontFamily,
+            'ITEMFONTFAMILY': self.fontFamily,
             'LAYERTITLE': 'FALSE'
         }
         qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()])
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_notset0", 250, QSize(15, 15))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_notset", 250, QSize(15, 15))
 
-        # LAYERTITLE false and no set of RULELABEL means it is true for legend other than single symbol
+        # RULELABEL AUTO for single symbol means it is removed
         parms = {
-            'MAP': self.testdata_path + "test_project_legend_rule.qgs",
+            'MAP': self.testdata_path + "test_project.qgs",
             'SERVICE': 'WMS',
             'VERSION': '1.3.0',
             'REQUEST': 'GetLegendGraphic',
             'FORMAT': 'image/png',
             'LAYER': u'testlayer%20èé',
-            'ITEMFONTBOLD': 'TRUE',
-            'ITEMFONTSIZE': '20',
-            'LAYERFONTFAMILY': self.fontFamily,
-            'ITEMFONTFAMILY': self.fontFamily,
-            'LAYERTITLE': 'FALSE'
+            'LAYERTITLE': 'FALSE',
+            'RULELABEL': 'AUTO'
         }
         qs = '?' + '&'.join([u"%s=%s" % (k, v) for k, v in parms.items()])
         r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_notset1", 250, QSize(15, 15))
+        self._img_diff_error(r, h, "WMS_GetLegendGraphic_rulelabel_auto", 250, QSize(15, 15))
 
     def test_wms_getLegendGraphics_rule(self):
         """Test that does not return an exception but an image"""

diff --git a/...MS_GetLegendGraphic_rulelabel_notset0.png → ...o/WMS_GetLegendGraphic_rulelabel_auto.png b/...MS_GetLegendGraphic_rulelabel_notset0.png → ...o/WMS_GetLegendGraphic_rulelabel_auto.png
diff --git a/...tLegendGraphic_rulelabel_notset0_mask.png → ..._GetLegendGraphic_rulelabel_auto_mask.png b/...tLegendGraphic_rulelabel_notset0_mask.png → ..._GetLegendGraphic_rulelabel_auto_mask.png
diff --git a/...WMS_GetLegendGraphic_rulelabel_notset/WMS_GetLegendGraphic_rulelabel_notset.png b/...WMS_GetLegendGraphic_rulelabel_notset/WMS_GetLegendGraphic_rulelabel_notset.png
diff --git a/...etLegendGraphic_rulelabel_notset/WMS_GetLegendGraphic_rulelabel_notset_mask.png b/...etLegendGraphic_rulelabel_notset/WMS_GetLegendGraphic_rulelabel_notset_mask.png
diff --git a/...S_GetLegendGraphic_rulelabel_notset1/WMS_GetLegendGraphic_rulelabel_notset1.png b/...S_GetLegendGraphic_rulelabel_notset1/WMS_GetLegendGraphic_rulelabel_notset1.png
diff --git a/...LegendGraphic_rulelabel_notset1/WMS_GetLegendGraphic_rulelabel_notset1_mask.png b/...LegendGraphic_rulelabel_notset1/WMS_GetLegendGraphic_rulelabel_notset1_mask.png