hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

bdd: use new check_for_attributes() function also in steps

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-03-09 16:44:07 +01:00
parent fbff4fa218
commit 9769a0dcdb
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/bdd/steps/steps_api_queries.py
View File

@@ -19,7 +19,7 @@ from urllib.parse import urlencode
from utils import run_script from utils import run_script
from http_responses import GenericResponse, SearchResponse, ReverseResponse, StatusResponse from http_responses import GenericResponse, SearchResponse, ReverseResponse, StatusResponse
from check_functions import Bbox from check_functions import Bbox, check_for_attributes
from table_compare import NominatimID from table_compare import NominatimID
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -248,17 +248,12 @@ def check_header_attr(context):
line['attr'], line['value'], line['attr'], line['value'],
context.response.header[line['attr']]) context.response.header[line['attr']])
@then(u'result header has (?P<neg>not )?attributes (?P<attrs>.*)') @then(u'result header has (?P<neg>not )?attributes (?P<attrs>.*)')
def check_header_no_attr(context, neg, attrs): def check_header_no_attr(context, neg, attrs):
for attr in attrs.split(','): check_for_attributes(context.response.header, attrs,
if neg: 'absent' if neg else 'present')
assert attr not in context.response.header, \
"Unexpected attribute {}. Full response:\n{}".format(
attr, json.dumps(context.response.header, sort_keys=True, indent=2))
else:
assert attr in context.response.header, \
"No attribute {}. Full response:\n{}".format(
attr, json.dumps(context.response.header, sort_keys=True, indent=2))
@then(u'results contain') @then(u'results contain')
def step_impl(context): def step_impl(context):
@@ -267,6 +262,7 @@ def step_impl(context):
for line in context.table: for line in context.table:
context.response.match_row(line, context=context) context.response.match_row(line, context=context)
@then(u'result (?P<lid>\d+ )?has (?P<neg>not )?attributes (?P<attrs>.*)') @then(u'result (?P<lid>\d+ )?has (?P<neg>not )?attributes (?P<attrs>.*)')
def validate_attributes(context, lid, neg, attrs): def validate_attributes(context, lid, neg, attrs):
if lid is None: if lid is None:
@@ -277,15 +273,9 @@ def validate_attributes(context, lid, neg, attrs):
context.execute_steps("then more than %sresults are returned" % lid) context.execute_steps("then more than %sresults are returned" % lid)
for i in idx: for i in idx:
for attr in attrs.split(','): check_for_attributes(context.response.result[i], attrs,
if neg: 'absent' if neg else 'present')
assert attr not in context.response.result[i],\
"Unexpected attribute {}. Full response:\n{}".format(
attr, json.dumps(context.response.result[i], sort_keys=True, indent=2))
else:
assert attr in context.response.result[i], \
"No attribute {}. Full response:\n{}".format(
attr, json.dumps(context.response.result[i], sort_keys=True, indent=2))
@then(u'result addresses contain') @then(u'result addresses contain')
def step_impl(context): def step_impl(context):