Fix broken server tests

These tests had lots of issues, including some inappropriate mask images which nullified the tests!
qgis · May 3, 2020 · a934f0f · a934f0f
1 parent 00df371
commit a934f0f
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 6 deletions.
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -40,7 +40,7 @@
 
 from io import StringIO
 from qgis.server import QgsServer, QgsServerRequest, QgsBufferServerRequest, QgsBufferServerResponse
-from qgis.core import QgsRenderChecker, QgsApplication, QgsFontUtils
+from qgis.core import QgsRenderChecker, QgsApplication, QgsFontUtils, QgsMultiRenderChecker
 from qgis.testing import unittest
 from qgis.PyQt.QtCore import QSize
 from utilities import unitTestDataPath
@@ -188,13 +188,13 @@ def _img_diff(self, image, control_image, max_diff, max_size_diff=QSize(), outpu
         if outputJpg:
             return (True, "QgsRenderChecker can't be used for JPG images")
 
-        control = QgsRenderChecker()
+        control = QgsMultiRenderChecker()
         control.setControlPathPrefix("qgis_server")
         control.setControlName(control_image)
         control.setRenderedImage(temp_image)
         if max_size_diff.isValid():
             control.setSizeTolerance(max_size_diff.width(), max_size_diff.height())
-        return control.compareImages(control_image, max_diff), control.report()
+        return control.runTest(control_image, max_diff), control.report()
 
     def _img_diff_error(self, response, headers, image, max_diff=100, max_size_diff=QSize(), unittest_data_path='control_images', outputJpg=False):
 

diff --git a/tests/src/python/test_qgsserver_wms_getprint.py b/tests/src/python/test_qgsserver_wms_getprint.py
@@ -35,7 +35,7 @@
 import subprocess
 
 from test_qgsserver import QgsServerTestBase
-from qgis.core import QgsProject, QgsRenderChecker
+from qgis.core import QgsProject, QgsRenderChecker, QgsMultiRenderChecker
 from qgis.server import QgsServerRequest
 from utilities import getExecutablePath, unitTestDataPath
 
@@ -105,13 +105,13 @@ def _pdf_diff(self, pdf, control_image, max_diff, max_size_diff=QSize(), dpi=96)
         temp_image = os.path.join(tempfile.gettempdir(), "%s_result.png" % control_image)
         self._pdf_to_png(temp_pdf, temp_image, dpi=dpi, page=1)
 
-        control = QgsRenderChecker()
+        control = QgsMultiRenderChecker()
         control.setControlPathPrefix("qgis_server")
         control.setControlName(control_image)
         control.setRenderedImage(temp_image)
         if max_size_diff.isValid():
             control.setSizeTolerance(max_size_diff.width(), max_size_diff.height())
-        return control.compareImages(control_image, max_diff), control.report()
+        return control.runTest(control_image, max_diff), control.report()
 
     def _pdf_diff_error(self, response, headers, image, max_diff=100, max_size_diff=QSize(), unittest_data_path='control_images', dpi=96):
 

diff --git a/...tdata/control_images/qgis_server/WMS_GetPrint_Atlas/WMS_GetPrint_Atlas_mask.png b/...tdata/control_images/qgis_server/WMS_GetPrint_Atlas/WMS_GetPrint_Atlas_mask.png
diff --git a/...ntrol_images/qgis_server/WMS_GetPrint_Basic_Pdf/WMS_GetPrint_Basic_Pdf_mask.png b/...ntrol_images/qgis_server/WMS_GetPrint_Basic_Pdf/WMS_GetPrint_Basic_Pdf_mask.png
diff --git a/...tdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group_mask.png b/...tdata/control_images/qgis_server/WMS_GetPrint_Group/WMS_GetPrint_Group_mask.png
diff --git a/...ntrol_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight_mask.png b/...ntrol_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight_mask.png
diff --git a/...rint_Highlight/WMS_GetPrint_Highlight.png → ...t_Highlight/v1/WMS_GetPrint_Highlight.png b/...rint_Highlight/WMS_GetPrint_Highlight.png → ...t_Highlight/v1/WMS_GetPrint_Highlight.png
diff --git a/...control_images/qgis_server/WMS_GetPrint_Highlight/v2/WMS_GetPrint_Highlight.png b/...control_images/qgis_server/WMS_GetPrint_Highlight/v2/WMS_GetPrint_Highlight.png
diff --git a/...tdata/control_images/qgis_server/WMS_GetPrint_Scale/WMS_GetPrint_Scale_mask.png b/...tdata/control_images/qgis_server/WMS_GetPrint_Scale/WMS_GetPrint_Scale_mask.png
diff --git a/...ages/qgis_server/WMS_GetPrint_Selection_Pdf/WMS_GetPrint_Selection_Pdf_mask.png b/...ages/qgis_server/WMS_GetPrint_Selection_Pdf/WMS_GetPrint_Selection_Pdf_mask.png
diff --git a/...l_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom_mask.png b/...l_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom_mask.png
diff --git a/...images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault_mask.png b/...images/qgis_server/WMS_GetPrint_StyleDefault/WMS_GetPrint_StyleDefault_mask.png