Fix unit test

qgis · Jan 28, 2019 · 7018919 · 7018919
1 parent 1b6ed5f
commit 7018919
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -398,6 +398,7 @@ QgsServerParameters::QgsServerParameters()
 QgsServerParameters::QgsServerParameters( const QUrlQuery &query )
   : QgsServerParameters()
 {
+  mUrlQuery = query;
   load( query );
 }
 
@@ -415,14 +416,7 @@ void QgsServerParameters::add( const QString &key, const QString &value )
 
 QUrlQuery QgsServerParameters::urlQuery() const
 {
-  QUrlQuery query;
-
-  for ( auto param : toMap().toStdMap() )
-  {
-    query.addQueryItem( param.first, param.second );
-  }
-
-  return query;
+  return mUrlQuery;
 }
 
 void QgsServerParameters::remove( QgsServerParameter::Name name )

diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h
@@ -338,6 +338,7 @@ class SERVER_EXPORT QgsServerParameters
     QVariant value( QgsServerParameter::Name name ) const;
 
     QMap<QgsServerParameter::Name, QgsServerParameter> mParameters;
+    QUrlQuery mUrlQuery;
 };
 
 #endif
diff --git a/tests/src/python/test_qgsserver_wms_getfeatureinfo.py b/tests/src/python/test_qgsserver_wms_getfeatureinfo.py
@@ -449,7 +449,7 @@ def testGetFeatureInfoJSON(self):
                                  'width=600&height=400&srs=EPSG%3A3857&bbox=913190.6389747962%2C' +
                                  '5606005.488876367%2C913235.426296057%2C5606035.347090538&' +
                                  'query_layers=testlayer%20%C3%A8%C3%A9&X=190&Y=320',
-                                 'wms_getfeatureinfo_json')
+                                 'wms_getfeatureinfo_geojson')
 
         # test with several features and several layers
         self.wms_request_compare('GetFeatureInfo',

diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_geojson.txt
@@ -0,0 +1,19 @@
+*****
+Content-Type: application/geo+json; charset=utf-8
+
+{
+"layers":[{
+ "name": "testlayer èé",
+ "type": "FeatureCollection",
+    "features":[
+{
+   "type":"Feature",
+   "id":2,
+   "geometry":null,
+   "properties":{
+      "id":3,
+      "name":"three",
+      "utf8nameè":"three èé↓"
+   }
+}
+]}]}