Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #41124 Fix for JSON and GML only: the other formats were already ok.
- Loading branch information
Showing
4 changed files
with
141 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
tests/src/python/test_qgsserver_wms_getfeatureinfo_postgres.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| # -*- coding: utf-8 -*- | ||
| """QGIS Unit tests for QgsServer GetFeatureInfo WMS with PG. | ||
| From build dir, run: ctest -R PyQgsServerWMSGetFeatureInfoPG -V | ||
| .. note:: This program is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 2 of the License, or | ||
| (at your option) any later version. | ||
| """ | ||
| __author__ = 'Alessandro Pasotti' | ||
| __date__ = '22/01/2021' | ||
| __copyright__ = 'Copyright 2021, The QGIS Project' | ||
| # This will get replaced with a git SHA1 when you do a git archive | ||
| __revision__ = '$Format:%H$' | ||
|
|
||
| import os | ||
| import tempfile | ||
|
|
||
| # Needed on Qt 5 so that the serialization of XML is consistent among all | ||
| # executions | ||
| os.environ['QT_HASH_SEED'] = '1' | ||
|
|
||
| os.environ['QGIS_CUSTOM_CONFIG_PATH'] = tempfile.mkdtemp('', 'QGIS-PythonTestConfigPath') | ||
|
|
||
| import re | ||
| import urllib.request | ||
| import urllib.parse | ||
| import urllib.error | ||
|
|
||
| import xml.etree.ElementTree as ET | ||
| import json | ||
|
|
||
| from qgis.testing import unittest, start_app | ||
| from qgis.PyQt.QtCore import QSize | ||
|
|
||
| import osgeo.gdal # NOQA | ||
|
|
||
| from test_qgsserver_wms import TestQgsServerWMSTestBase | ||
| from qgis.core import QgsProject, QgsVectorLayer, QgsFeatureRequest, QgsExpression, QgsProviderRegistry | ||
| from qgis.server import QgsBufferServerRequest, QgsBufferServerResponse | ||
|
|
||
|
|
||
| class TestQgsServerWMSGetFeatureInfoPG(TestQgsServerWMSTestBase): | ||
| """QGIS Server WMS Tests for GetFeatureInfo request""" | ||
|
|
||
| @classmethod | ||
| def setUpClass(cls): | ||
|
|
||
| super().setUpClass() | ||
|
|
||
| cls.dbconn = 'service=qgis_test' | ||
| if 'QGIS_PGTEST_DB' in os.environ: | ||
| cls.dbconn = os.environ['QGIS_PGTEST_DB'] | ||
|
|
||
| # Test layer | ||
| md = QgsProviderRegistry.instance().providerMetadata('postgres') | ||
| uri = cls.dbconn + 'dbname=qgis_test sslmode=disable ' | ||
| conn = md.createConnection(uri, {}) | ||
| conn.executeSql('DROP TABLE IF EXISTS "qgis_test"."someDataLong" CASCADE') | ||
| conn.executeSql('SELECT * INTO "qgis_test"."someDataLong" FROM "qgis_test"."someData"') | ||
| conn.executeSql('ALTER TABLE "qgis_test"."someDataLong" ALTER COLUMN "pk" TYPE bigint') | ||
| conn.executeSql('ALTER TABLE "qgis_test"."someDataLong" ALTER COLUMN "pk" TYPE bigint') | ||
| conn.executeSql('ALTER TABLE "qgis_test"."someDataLong" ALTER COLUMN "pk" SET NOT NULL') | ||
| conn.executeSql('CREATE UNIQUE INDEX someDataLongIdx ON "qgis_test"."someDataLong" ("pk")') | ||
|
|
||
| cls.vlconn = cls.dbconn + ' sslmode=disable key=\'pk\' checkPrimaryKeyUnicity=0 srid=4326 type=POINT table="qgis_test"."someDataLong" (geom) sql=' | ||
|
|
||
| def _baseFilterTest(self, info_format): | ||
|
|
||
| vl = QgsVectorLayer(self.vlconn, 'someData', 'postgres') | ||
| self.assertTrue(vl.isValid()) | ||
|
|
||
| # Pre-filtered | ||
| vl2 = QgsVectorLayer(self.vlconn, 'someData', 'postgres') | ||
| self.assertTrue(vl2.isValid()) | ||
| [f for f in vl2.getFeatures(QgsFeatureRequest(QgsExpression('pk > 2')))] | ||
|
|
||
| base_features_url = ('http://qgis/?SERVICE=WMS&REQUEST=GetFeatureInfo&' + | ||
| 'LAYERS=someData&STYLES=&' + | ||
| r'INFO_FORMAT={}&' + | ||
| 'SRS=EPSG%3A4326&' + | ||
| 'QUERY_LAYERS=someData&X=-1&Y=-1&' + | ||
| 'FEATURE_COUNT=100&' | ||
| 'FILTER=someData') | ||
|
|
||
| two_feature_url = base_features_url + urllib.parse.quote(':"pk" = 2') | ||
|
|
||
| p = QgsProject() | ||
| p.addMapLayers([vl]) | ||
|
|
||
| url = two_feature_url.format(urllib.parse.quote(info_format)) | ||
|
|
||
| req = QgsBufferServerRequest(url) | ||
| res = QgsBufferServerResponse() | ||
| self.server.handleRequest(req, res, p) | ||
| reference_body = bytes(res.body()).decode('utf8') | ||
|
|
||
| # Pre-filter | ||
| p = QgsProject() | ||
| p.addMapLayers([vl2]) | ||
|
|
||
| req = QgsBufferServerRequest(url) | ||
| res = QgsBufferServerResponse() | ||
| self.server.handleRequest(req, res, p) | ||
| two_feature_body = bytes(res.body()).decode('utf8') | ||
|
|
||
| self.assertEqual(reference_body, two_feature_body, info_format) | ||
|
|
||
| def testGetFeatureInfoFilterPg(self): | ||
| """Test issue GH #41124""" | ||
|
|
||
| self._baseFilterTest('text/plain') | ||
| self._baseFilterTest('text/html') | ||
| self._baseFilterTest('text/xml') | ||
| self._baseFilterTest('application/json') | ||
| self._baseFilterTest('application/vnd.ogc.gml') | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| unittest.main() |