[Server] Fix tests: after enhancing WFS GeoJSON

qgis · Mar 16, 2018 · 9cfdc03 · 9cfdc03
1 parent e53f4a8
commit 9cfdc03
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -548,7 +548,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
               }
             }
           }
-          attrIndexes = idxList;
+          if ( !idxList.isEmpty() )
+          {
+            attrIndexes = idxList;
+          }
         }
         if ( !attrIndexes.isEmpty() && !layerExcludedAttributes.isEmpty() )
         {

diff --git a/tests/src/python/test_qgsserver_accesscontrol.py b/tests/src/python/test_qgsserver_accesscontrol.py
@@ -623,12 +623,12 @@ def test_wfs_getfeature_country(self):
         response, headers = self._post_fullaccess(data)
         self.assertTrue(
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
-            "No result in GetFeatureInfo\n%s" % response)
+            "No result in GetFeature\n%s" % response)
 
         response, headers = self._post_restricted(data)
         self.assertFalse(
             str(response).find("<qgs:pk>1</qgs:pk>") != -1,
-            "Unexpeced result in GetFeatureInfo\n%s" % response)
+            "Unexpeced result in GetFeature\n%s" % response)
 
 
 # # WCS # # WCS # # WCS # #

diff --git a/tests/testdata/qgis_server/wfs_getfeature_multiple.txt b/tests/testdata/qgis_server/wfs_getfeature_multiple.txt
@@ -21,7 +21,6 @@ Content-Type: text/xml; charset=utf-8
     </outerBoundaryIs>
    </Polygon>
   </qgs:geometry>
-  <qgs:id>42</qgs:id>
  </qgs:secondlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -40,7 +39,6 @@ Content-Type: text/xml; charset=utf-8
     </outerBoundaryIs>
    </Polygon>
   </qgs:geometry>
-  <qgs:id>43</qgs:id>
  </qgs:secondlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -55,9 +53,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20349634,44.90148253</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>1</qgs:id>
-  <qgs:name>one</qgs:name>
-  <qgs:utf8nameè>one èé</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -72,9 +67,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20354699,44.90143568</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>2</qgs:id>
-  <qgs:name>two</qgs:name>
-  <qgs:utf8nameè>two àò</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -89,9 +81,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20345931,44.90139484</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>3</qgs:id>
-  <qgs:name>three</qgs:name>
-  <qgs:utf8nameè>three èé↓</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 </wfs:FeatureCollection>
diff --git a/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt b/tests/testdata/qgis_server/wfs_getfeature_nobbox.txt
@@ -17,9 +17,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20349634,44.90148253</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>1</qgs:id>
-  <qgs:name>one</qgs:name>
-  <qgs:utf8nameè>one èé</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -34,9 +31,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20354699,44.90143568</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>2</qgs:id>
-  <qgs:name>two</qgs:name>
-  <qgs:utf8nameè>two àò</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 <gml:featureMember>
@@ -51,9 +45,6 @@ Content-Type: text/xml; charset=utf-8
     <coordinates xmlns="http://www.opengis.net/gml" cs="," ts=" ">8.20345931,44.90139484</coordinates>
    </Point>
   </qgs:geometry>
-  <qgs:id>3</qgs:id>
-  <qgs:name>three</qgs:name>
-  <qgs:utf8nameè>three èé↓</qgs:utf8nameè>
  </qgs:testlayer>
 </gml:featureMember>
 </wfs:FeatureCollection>