Merge pull request #7669 from sbrunner/wfs-namespace

Add tests on WFS GetFeature with right namespace
qgis · Aug 21, 2018 · bc6ea8cb86a377746857e128439f7174061f5368 · bc6ea8c
2 parents c0032f1 + eab6440
commit bc6ea8cb86a377746857e128439f7174061f5368
Unified Split

Showing with 37 additions and 2 deletions.

+37 −2 tests/src/python/test_qgsserver_wfs.py
diff --git a/tests/src/python/test_qgsserver_wfs.py b/tests/src/python/test_qgsserver_wfs.py
@@ -190,6 +190,8 @@ def wfs_getfeature_post_compare(self, requestid, request):
         )
 
     def test_getfeature_post(self):
+        tests = []
+
         template = """<?xml version="1.0" encoding="UTF-8"?>
 <wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
   <wfs:Query typeName="testlayer" xmlns:feature="http://www.qgis.org/gml">
@@ -205,8 +207,6 @@ def test_getfeature_post(self):
   </wfs:Query>
 </wfs:GetFeature>
 """
-
-        tests = []
         tests.append(('nobbox_post', template.format("")))
         tests.append(('startindex2_post', template.format('startIndex="2"')))
         tests.append(('limit2_post', template.format('maxFeatures="2"')))
@@ -307,6 +307,41 @@ def test_getfeature_post(self):
 """
         tests.append(('bbox_inside_and_post', andBboxTemplate.format("")))
 
+        # With namespace
+        template = """<?xml version="1.0" encoding="UTF-8"?>
+<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+  <wfs:Query typeName="feature:testlayer" xmlns:feature="http://www.qgis.org/gml">
+    <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
+      <ogc:BBOX>
+        <ogc:PropertyName>geometry</ogc:PropertyName>
+        <gml:Envelope xmlns:gml="http://www.opengis.net/gml">
+          <gml:lowerCorner>8 44</gml:lowerCorner>
+          <gml:upperCorner>9 45</gml:upperCorner>
+        </gml:Envelope>
+      </ogc:BBOX>
+    </ogc:Filter>
+  </wfs:Query>
+</wfs:GetFeature>
+"""
+        tests.append(('nobbox_post', template.format("")))
+
+        template = """<?xml version="1.0" encoding="UTF-8"?>
+<wfs:GetFeature service="WFS" version="1.0.0" {} xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+  <wfs:Query typeName="testlayer" xmlns="http://www.qgis.org/gml">
+    <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
+      <ogc:BBOX>
+        <ogc:PropertyName>geometry</ogc:PropertyName>
+        <gml:Envelope xmlns:gml="http://www.opengis.net/gml">
+          <gml:lowerCorner>8 44</gml:lowerCorner>
+          <gml:upperCorner>9 45</gml:upperCorner>
+        </gml:Envelope>
+      </ogc:BBOX>
+    </ogc:Filter>
+  </wfs:Query>
+</wfs:GetFeature>
+"""
+        tests.append(('nobbox_post', template.format("")))
+
         for id, req in tests:
             self.wfs_getfeature_post_compare(id, req)