Adapt expected capabilities / project settings response in server tes…

…t for WMS 1.3.0 compliance
qgis · Dec 13, 2016 · 35be15b · 35be15b
1 parent 63a2f62
commit 35be15b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/tests/testdata/qgis_server/getcapabilities.txt b/tests/testdata/qgis_server/getcapabilities.txt
@@ -97,11 +97,12 @@ Content-Type: text/xml; charset=utf-8
    </qgs:GetStyles>
   </Request>
   <Exception>
-   <Format>text/xml</Format>
+   <Format>XML</Format>
   </Exception>
   <Layer queryable="1">
    <Name>QGIS Test Project</Name>
    <Title>QGIS Test Project</Title>
+   <CRS>CRS:84</CRS>
    <CRS>EPSG:4326</CRS>
    <CRS>EPSG:3857</CRS>
    <EX_GeographicBoundingBox>
@@ -116,6 +117,7 @@ Content-Type: text/xml; charset=utf-8
     <Name>testlayer èé</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>

diff --git a/tests/testdata/qgis_server/getcapabilities_inspire.txt b/tests/testdata/qgis_server/getcapabilities_inspire.txt
@@ -97,7 +97,7 @@ Content-Type: text/xml; charset=utf-8
    </qgs:GetStyles>
   </Request>
   <Exception>
-   <Format>text/xml</Format>
+   <Format>XML</Format>
   </Exception>
   <sld:UserDefinedSymbolization RemoteWFS="0" RemoteWCS="0" InlineFeature="0" UserStyle="1" SupportSLD="1" UserLayer="0"/>
   <inspire_vs:ExtendedCapabilities>
@@ -123,6 +123,7 @@ Content-Type: text/xml; charset=utf-8
   <Layer queryable="1">
    <Name>QGIS Test Project</Name>
    <Title>QGIS Test Project</Title>
+   <CRS>CRS:84</CRS>
    <CRS>EPSG:4326</CRS>
    <CRS>EPSG:3857</CRS>
    <EX_GeographicBoundingBox>
@@ -137,6 +138,7 @@ Content-Type: text/xml; charset=utf-8
     <Name>testlayer èé</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>

diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -109,7 +109,7 @@ Content-Type: text/xml; charset=utf-8
    </GetPrint>
   </Request>
   <Exception>
-   <Format>text/xml</Format>
+   <Format>XML</Format>
   </Exception>
   <sld:UserDefinedSymbolization RemoteWFS="0" RemoteWCS="0" InlineFeature="0" UserStyle="1" SupportSLD="1" UserLayer="0"/>
   <WFSLayers>
@@ -118,6 +118,7 @@ Content-Type: text/xml; charset=utf-8
   <Layer queryable="1">
    <Name>QGIS Test Project</Name>
    <Title>QGIS Test Project</Title>
+   <CRS>CRS:84</CRS>
    <CRS>EPSG:4326</CRS>
    <CRS>EPSG:3857</CRS>
    <EX_GeographicBoundingBox>
@@ -133,6 +134,7 @@ Content-Type: text/xml; charset=utf-8
     <Name>testlayer èé</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>