Skip to content

Commit 90355f0

Browse files
committedMay 8, 2018
address comments and add @unittest.expectedFailure to test
1 parent 27b4170 commit 90355f0

File tree

1 file changed

+55
-49
lines changed

1 file changed

+55
-49
lines changed
 

‎tests/src/python/test_qgsserver_wms_getfeatureinfo.py

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def testGetFeatureInfo(self):
6666
'query_layers=testlayer%20%C3%A8%C3%A9&X=190&Y=320',
6767
'wms_getfeatureinfo-text-html')
6868

69-
#Test getfeatureinfo response html with geometry
69+
# Test getfeatureinfo response html with geometry
7070
self.wms_request_compare('GetFeatureInfo',
7171
'&layers=testlayer%20%C3%A8%C3%A9&styles=&' +
7272
'info_format=text%2Fhtml&transparent=true&' +
@@ -76,7 +76,7 @@ def testGetFeatureInfo(self):
7676
'with_geometry=true',
7777
'wms_getfeatureinfo-text-html-geometry')
7878

79-
#Test getfeatureinfo response html with maptip
79+
# Test getfeatureinfo response html with maptip
8080
self.wms_request_compare('GetFeatureInfo',
8181
'&layers=testlayer%20%C3%A8%C3%A9&styles=&' +
8282
'info_format=text%2Fhtml&transparent=true&' +
@@ -181,53 +181,59 @@ def testGetFeatureInfo(self):
181181
'wms_getfeatureinfo-values1-text-xml',
182182
'test_project_values.qgs')
183183

184-
# Test GetFeatureInfo resolves "value relation" widget values
185-
# TODO fix regression and enable test
186-
# mypath = self.testdata_path + "test_project_values.qgs"
187-
# self.wms_request_compare('GetFeatureInfo',
188-
# '&layers=layer1&styles=&' +
189-
# 'VERSION=1.3.0&' +
190-
# 'info_format=text%2Fxml&' +
191-
# 'width=926&height=787&srs=EPSG%3A4326' +
192-
# '&bbox=912217,5605059,914099,5606652' +
193-
# '&CRS=EPSG:3857' +
194-
# '&FEATURE_COUNT=10' +
195-
# '&WITH_GEOMETRY=True' +
196-
# '&QUERY_LAYERS=layer1&I=487&J=308',
197-
# 'wms_getfeatureinfo-values1-text-xml',
198-
# 'test_project_values.qgs')
199-
200-
# Test GetFeatureInfo on "value relation" widget with array field (multiple selections)
201-
# TODO make GetFeatureInfo show the dictionary values and enable test
202-
# mypath = self.testdata_path + "test_project_values.qgs"
203-
# self.wms_request_compare('GetFeatureInfo',
204-
# '&layers=layer3&styles=&' +
205-
# 'VERSION=1.3.0&' +
206-
# 'info_format=text%2Fxml&' +
207-
# 'width=926&height=787&srs=EPSG%3A4326' +
208-
# '&bbox=912217,5605059,914099,5606652' +
209-
# '&CRS=EPSG:3857' +
210-
# '&FEATURE_COUNT=10' +
211-
# '&WITH_GEOMETRY=True' +
212-
# '&QUERY_LAYERS=layer3&I=487&J=308',
213-
# 'wms_getfeatureinfo-values3-text-xml',
214-
# 'test_project_values.qgs')
215-
216-
# Test GetFeatureInfo resolves "relation reference" widget "display expression" values
217-
# TODO make GetFeatureInfo show what's in the display expression and enable test
218-
# mypath = self.testdata_path + "test_project_values.qgs"
219-
# self.wms_request_compare('GetFeatureInfo',
220-
# '&layers=layer2&styles=&' +
221-
# 'VERSION=1.3.0&' +
222-
# 'info_format=text%2Fxml&' +
223-
# 'width=926&height=787&srs=EPSG%3A4326' +
224-
# '&bbox=912217,5605059,914099,5606652' +
225-
# '&CRS=EPSG:3857' +
226-
# '&FEATURE_COUNT=10' +
227-
# '&WITH_GEOMETRY=True' +
228-
# '&QUERY_LAYERS=layer2&I=487&J=308',
229-
# 'wms_getfeatureinfo-values2-text-xml',
230-
# 'test_project_values.qgs')
184+
# TODO fix regression in QGIS 3 as the widget values don't get solved and enable test
185+
@unittest.expectedFailure
186+
def testGetFeatureInfoValueRelation(self):
187+
"""Test GetFeatureInfo resolves "value relation" widget values"""
188+
mypath = self.testdata_path + "test_project_values.qgs"
189+
self.wms_request_compare('GetFeatureInfo',
190+
'&layers=layer1&styles=&' +
191+
'VERSION=1.3.0&' +
192+
'info_format=text%2Fxml&' +
193+
'width=926&height=787&srs=EPSG%3A4326' +
194+
'&bbox=912217,5605059,914099,5606652' +
195+
'&CRS=EPSG:3857' +
196+
'&FEATURE_COUNT=10' +
197+
'&WITH_GEOMETRY=True' +
198+
'&QUERY_LAYERS=layer1&I=487&J=308',
199+
'wms_getfeatureinfo-values1-text-xml',
200+
'test_project_values.qgs')
201+
202+
# TODO make GetFeatureInfo show the dictionary values and enable test
203+
@unittest.expectedFailure
204+
def testGetFeatureInfoValueRelationArray(self):
205+
"""Test GetFeatureInfo on "value relation" widget with array field (multiple selections)"""
206+
mypath = self.testdata_path + "test_project_values.qgs"
207+
self.wms_request_compare('GetFeatureInfo',
208+
'&layers=layer3&styles=&' +
209+
'VERSION=1.3.0&' +
210+
'info_format=text%2Fxml&' +
211+
'width=926&height=787&srs=EPSG%3A4326' +
212+
'&bbox=912217,5605059,914099,5606652' +
213+
'&CRS=EPSG:3857' +
214+
'&FEATURE_COUNT=10' +
215+
'&WITH_GEOMETRY=True' +
216+
'&QUERY_LAYERS=layer3&I=487&J=308',
217+
'wms_getfeatureinfo-values3-text-xml',
218+
'test_project_values.qgs')
219+
220+
# TODO make GetFeatureInfo show what's in the display expression and enable test
221+
@unittest.expectedFailure
222+
def testGetFeatureInfoRelationReference(self):
223+
"""Test GetFeatureInfo solves "relation reference" widget "display expression" values"""
224+
mypath = self.testdata_path + "test_project_values.qgs"
225+
self.wms_request_compare('GetFeatureInfo',
226+
'&layers=layer2&styles=&' +
227+
'VERSION=1.3.0&' +
228+
'info_format=text%2Fxml&' +
229+
'width=926&height=787&srs=EPSG%3A4326' +
230+
'&bbox=912217,5605059,914099,5606652' +
231+
'&CRS=EPSG:3857' +
232+
'&FEATURE_COUNT=10' +
233+
'&WITH_GEOMETRY=True' +
234+
'&QUERY_LAYERS=layer2&I=487&J=308',
235+
'wms_getfeatureinfo-values2-text-xml',
236+
'test_project_values.qgs')
231237

232238
def testGetFeatureInfoFilter(self):
233239
# Test getfeatureinfo response xml

0 commit comments

Comments
 (0)
Please sign in to comment.