Update wms server test control files

qgis · Apr 5, 2019 · 22738bc · 22738bc
1 parent 2a6653e
commit 22738bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 73 deletions.
diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -1,6 +1,5 @@
-Content-Length: 6939
+*****
 Content-Type: text/xml; charset=utf-8
-
 <?xml version="1.0" encoding="utf-8"?>
 <WMS_Capabilities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:qgs="http://www.qgis.org/wms" xmlns="http://www.opengis.net/wms" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd https://www.qgis.org/?*****" version="1.3.0" xmlns:sld="http://www.opengis.net/sld">
  <Service>
@@ -119,7 +118,7 @@ Content-Type: text/xml; charset=utf-8
   <WFSLayers>
    <WFSLayer name="testlayer èé"/>
   </WFSLayers>
-  <Layer>
+  <Layer queryable="1">
    <Title>QGIS Test Project</Title>
    <Abstract>QGIS Test Project</Abstract>
    <CRS>CRS:84</CRS>
@@ -131,7 +130,7 @@ Content-Type: text/xml; charset=utf-8
     <southBoundLatitude>44.9012</southBoundLatitude>
     <northBoundLatitude>44.9016</northBoundLatitude>
    </EX_GeographicBoundingBox>
-   <BoundingBox maxy="5.60604e+06" maxx="913283" miny="5.60599e+06" CRS="EPSG:3857" minx="913171"/>
+   <BoundingBox maxy="5.60604e+6" maxx="913283" miny="5.60599e+6" CRS="EPSG:3857" minx="913171"/>
    <BoundingBox maxy="8.20416" maxx="44.9016" miny="8.20315" CRS="EPSG:4326" minx="44.9012"/>
    <Name>QGIS Test Project</Name>
    <KeywordList>
@@ -151,7 +150,7 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>44.9014</southBoundLatitude>
      <northBoundLatitude>44.9015</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Style>
      <Name>default</Name>
@@ -181,7 +180,7 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>44.9014</southBoundLatitude>
      <northBoundLatitude>44.9015</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <Style>
      <Name>default</Name>
@@ -198,66 +197,7 @@ Content-Type: text/xml; charset=utf-8
      <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
     </Attributes>
    </Layer>
-   <Layer geometryType="Point" queryable="1" displayField="alias_name" visible="1">
-    <Name>fields_alias</Name>
-    <Title>A test vector layer</Title>
-    <Abstract>A test vector layer with unicode òà</Abstract>
-    <CRS>CRS:84</CRS>
-    <CRS>EPSG:4326</CRS>
-    <CRS>EPSG:3857</CRS>
-    <EX_GeographicBoundingBox>
-     <westBoundLongitude>8.20346</westBoundLongitude>
-     <eastBoundLongitude>8.20355</eastBoundLongitude>
-     <southBoundLatitude>44.9014</southBoundLatitude>
-     <northBoundLatitude>44.9015</northBoundLatitude>
-    </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-    <Style>
-     <Name>default</Name>
-     <Title>default</Title>
-     <LegendURL>
-      <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-     </LegendURL>
-    </Style>
-    <TreeName>fields_alias</TreeName>
-    <Attributes>
-     <Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" alias="alias_id" name="id" comment="" length="10"/>
-     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" alias="alias_name" name="name" comment="" length="10"/>
-     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
-    </Attributes>
-   </Layer>
-   <Layer geometryType="Point" queryable="1" displayField="name" visible="1">
-    <Name>exclude_attribute</Name>
-    <Title>A test vector layer</Title>
-    <Abstract>A test vector layer with unicode òà</Abstract>
-    <CRS>CRS:84</CRS>
-    <CRS>EPSG:4326</CRS>
-    <CRS>EPSG:3857</CRS>
-    <EX_GeographicBoundingBox>
-     <westBoundLongitude>8.20346</westBoundLongitude>
-     <eastBoundLongitude>8.20355</eastBoundLongitude>
-     <southBoundLatitude>44.9014</southBoundLatitude>
-     <northBoundLatitude>44.9015</northBoundLatitude>
-    </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
-    <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
-    <Style>
-     <Name>default</Name>
-     <Title>default</Title>
-     <LegendURL>
-      <Format>image/png</Format>
-      <OnlineResource xlink:type="simple" xlink:href="https://www.qgis.org/?*****" xmlns:xlink="http://www.w3.org/1999/xlink"/>
-     </LegendURL>
-    </Style>
-    <TreeName>exclude_attribute</TreeName>
-    <Attributes>
-     <Attribute precision="0" type="qlonglong" editType="TextEdit" typeName="Integer64" name="id" comment="" length="10"/>
-     <Attribute precision="0" type="QString" editType="TextEdit" typeName="String" name="utf8nameè" comment="" length="13"/>
-    </Attributes>
-   </Layer>
-   <Layer mutuallyExclusive="0" visible="1" queryable="1">
+   <Layer queryable="1" mutuallyExclusive="0" visible="1">
     <Name>group_name</Name>
     <Title>Group title</Title>
     <Abstract>Group abstract</Abstract>
@@ -270,7 +210,7 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>44.9014</southBoundLatitude>
      <northBoundLatitude>44.9015</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <TreeName>groupwithshortname</TreeName>
     <Layer geometryType="Point" queryable="1" displayField="id" visible="1">
@@ -285,7 +225,7 @@ Content-Type: text/xml; charset=utf-8
       <southBoundLatitude>44.9014</southBoundLatitude>
       <northBoundLatitude>44.9015</northBoundLatitude>
      </EX_GeographicBoundingBox>
-     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
      <Style>
       <Name>default</Name>
@@ -303,7 +243,7 @@ Content-Type: text/xml; charset=utf-8
      </Attributes>
     </Layer>
    </Layer>
-   <Layer mutuallyExclusive="0" queryable="0" visible="1">
+   <Layer queryable="0" mutuallyExclusive="0" visible="1">
     <Name>groupwithoutshortname</Name>
     <Title>groupwithoutshortname</Title>
     <CRS>CRS:84</CRS>
@@ -315,7 +255,7 @@ Content-Type: text/xml; charset=utf-8
      <southBoundLatitude>44.9014</southBoundLatitude>
      <northBoundLatitude>44.9015</northBoundLatitude>
     </EX_GeographicBoundingBox>
-    <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+    <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
     <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
     <TreeName>groupwithoutshortname</TreeName>
     <Layer geometryType="Point" queryable="0" displayField="id" visible="1">
@@ -330,7 +270,7 @@ Content-Type: text/xml; charset=utf-8
       <southBoundLatitude>44.9014</southBoundLatitude>
       <northBoundLatitude>44.9015</northBoundLatitude>
      </EX_GeographicBoundingBox>
-     <BoundingBox maxy="5.60603e+06" maxx="913215" miny="5.60601e+06" CRS="EPSG:3857" minx="913205"/>
+     <BoundingBox maxy="5.60603e+6" maxx="913215" miny="5.60601e+6" CRS="EPSG:3857" minx="913205"/>
      <BoundingBox maxy="8.20355" maxx="44.9015" miny="8.20346" CRS="EPSG:4326" minx="44.9014"/>
      <Style>
       <Name>default</Name>

diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_top.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_top.txt
@@ -37,7 +37,7 @@ umrisstyp = 'durchgezogen'
 umrissstaerke = '1'
 umrissstaerke_prt = '3.00'
 umfang = '758.4703'
-flaeche = '12,879'
+flaeche = '12879'
 bemerkung = ''
 last_change = '2013-06-11 10:03:45.52301+02'
 
@@ -62,7 +62,7 @@ umrisstyp = 'durchgezogen'
 umrissstaerke = '1'
 umrissstaerke_prt = '3.00'
 umfang = '758.4703'
-flaeche = '12,879'
+flaeche = '12879'
 bemerkung = ''
 last_change = '2013-06-11 10:03:45.52301+02'