[layout][server] Update tests and mask images

qgis · Jan 10, 2018 · a117b6b · a117b6b
1 parent c3cac49
commit a117b6b
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 2 deletions.
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -74,6 +74,7 @@ def assertXMLEqual(self, response, expected, msg=''):
         for expected_line in expected_lines:
             expected_line = expected_line.strip()
             response_line = response_lines[line_no - 1].strip()
+            response_line = response_line.replace(b'e+6', b'e+06')
             # Compare tag
             if re.match(RE_ELEMENT, expected_line):
                 expected_elements = re.findall(RE_ELEMENT, expected_line)

diff --git a/...ntrol_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations_mask.png b/...ntrol_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations_mask.png
diff --git a/...control_images/qgis_server/WMS_GetMap_Mode_16bit/WMS_GetMap_Mode_16bit_mask.png b/...control_images/qgis_server/WMS_GetMap_Mode_16bit/WMS_GetMap_Mode_16bit_mask.png
diff --git a/...a/control_images/qgis_server/WMS_GetMap_Mode_1bit/WMS_GetMap_Mode_1bit_mask.png b/...a/control_images/qgis_server/WMS_GetMap_Mode_1bit/WMS_GetMap_Mode_1bit_mask.png
diff --git a/...a/control_images/qgis_server/WMS_GetMap_Mode_8bit/WMS_GetMap_Mode_8bit_mask.png b/...a/control_images/qgis_server/WMS_GetMap_Mode_8bit/WMS_GetMap_Mode_8bit_mask.png
diff --git a/...ntrol_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom_mask.png b/...ntrol_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom_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/...a/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity_mask.png b/...a/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity_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/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -112,8 +112,8 @@ Content-Type: text/xml; charset=utf-8
   <sld:UserDefinedSymbolization SupportSLD="1" RemoteWCS="0" UserLayer="0" InlineFeature="0" RemoteWFS="0" UserStyle="1"/>
   <ComposerTemplates>
    <ComposerTemplate height="210" width="297" name="mytemplate">
-    <ComposerMap height="26" width="61" name="map1"/>
+    <ComposerMap height="26" width="61" name="map0"/>
-    <ComposerMap height="103" width="87" name="map0"/>
+    <ComposerMap height="103" width="87" name="map1"/>
    </ComposerTemplate>
   </ComposerTemplates>
   <WFSLayers>