make housenumber interpolation tests more lenient

diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature
index e5040f1e247b79ab8bb2808df568ce9dea8436b7..fea4da41dd1d78d020fdcda48d3b1a89c1b437e6 100644 (file)
--- 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 |
         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 |
           | type          | value |
           | house_number  | 86 |
           | road          | Schellingstraße |

-          | suburb        | Eilbek |

           | postcode      | 22089 |
           | city          | Hamburg |
           | country       | Deutschland |
           | 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 |
         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 |
           | type          | value |
           | house_number  | 73 |
           | road          | Schellingstraße |

-          | suburb        | Eilbek |

           | postcode      | 22089 |
           | city          | Hamburg |
           | country       | Deutschland |
           | postcode      | 22089 |
           | city          | Hamburg |
           | country       | Deutschland |

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index d3b1203b47ae7a0c0cf1897b3bc7ec34c09988a6..d6473dfa2509118e0cbccad648aa22dbc10fab4a 100644 (file)
--- 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)
 
         else:
             assert_in(attr, addr_parts)
 

-@then(u'address of result (?P<lid>\d+) is')
-def check_address(context, lid):
+@then(u'address of result (?P<lid>\d+) (?P<complete>is|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'])
     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']]
 
                      "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<lid>\d+ )?has bounding box in (?P<coords>[\d,.-]+)')
 def step_impl(context, lid, coords):
 
 @then(u'result (?P<lid>\d+ )?has bounding box in (?P<coords>[\d,.-]+)')
 def step_impl(context, lid, coords):