X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/340e7f7210fca8095fc07ebaf3fb0e95cd0db518..16bb0071350f66ff67308c5d33ae95dc1f2341ea:/test/bdd/steps/http_responses.py?ds=sidebyside diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py index beafcd9e..247a397b 100644 --- a/test/bdd/steps/http_responses.py +++ b/test/bdd/steps/http_responses.py @@ -8,6 +8,8 @@ import xml.etree.ElementTree as ET from check_functions import Almost +OSM_TYPE = {'N' : 'node', 'W' : 'way', 'R' : 'relation'} + def _geojson_result_to_json_result(geojson_result): result = geojson_result['properties'] result['geojson'] = geojson_result['geometry'] @@ -131,7 +133,11 @@ class GenericResponse: if name == 'ID': pass elif name == 'osm': - self.assert_field(i, 'osm_type', value[0]) + assert 'osm_type' in self.result[i], \ + "Result row {} has no field 'osm_type'.\nFull row: {}"\ + .format(i, json.dumps(self.result[i], indent=4)) + assert self.result[i]['osm_type'] in (OSM_TYPE[value[0]], value[0]), \ + BadRowValueAssert(self, i, 'osm_type', value) self.assert_field(i, 'osm_id', value[1:]) elif name == 'centroid': lon, lat = value.split(' ')