From ca680fc9fc9cdf265479925b681b179611f1df41 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 11 Oct 2020 10:32:35 +0200 Subject: [PATCH] make housenumber interpolation tests more lenient --- test/bdd/api/search/queries.feature | 6 ++---- test/bdd/steps/queries.py | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature index e5040f1e..fea4da41 100644 --- a/test/bdd/api/search/queries.feature +++ b/test/bdd/api/search/queries.feature @@ -19,11 +19,10 @@ Feature: Search queries When sending json search query "Schellingstr 86, Hamburg" with address | accept-language | | de | - Then address of result 0 is + Then address of result 0 contains | type | value | | house_number | 86 | | road | Schellingstraße | - | suburb | Eilbek | | postcode | 22089 | | city | Hamburg | | country | Deutschland | @@ -33,11 +32,10 @@ Feature: Search queries When sending json search query "Schellingstr 73, Hamburg" with address | accept-language | | de | - Then address of result 0 is + Then address of result 0 contains | type | value | | house_number | 73 | | road | Schellingstraße | - | suburb | Eilbek | | postcode | 22089 | | city | Hamburg | | country | Deutschland | diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py index d3b1203b..d6473dfa 100644 --- a/test/bdd/steps/queries.py +++ b/test/bdd/steps/queries.py @@ -583,8 +583,8 @@ def check_address(context, lid, neg, attrs): else: assert_in(attr, addr_parts) -@then(u'address of result (?P\d+) is') -def check_address(context, lid): +@then(u'address of result (?P\d+) (?Pis|contains)') +def check_address(context, lid, complete): context.execute_steps("then more than %s results are returned" % lid) addr_parts = dict(context.response.result[int(lid)]['address']) @@ -595,7 +595,8 @@ def check_address(context, lid): "Bad address value for %s" % line['type']) del addr_parts[line['type']] - eq_(0, len(addr_parts), "Additional address parts found: %s" % str(addr_parts)) + if complete == 'is': + eq_(0, len(addr_parts), "Additional address parts found: %s" % str(addr_parts)) @then(u'result (?P\d+ )?has bounding box in (?P[\d,.-]+)') def step_impl(context, lid, coords): -- 2.39.5