X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/65d8770b28bfaaff56d34c9504916a2c0672394d..ce9ed993c8c83dff7a86e8bd87cf562364f26a94:/test/bdd/db/import/country.feature

diff --git a/test/bdd/db/import/country.feature b/test/bdd/db/import/country.feature
index 21f95e1f..070baeef 100644
--- a/test/bdd/db/import/country.feature
+++ b/test/bdd/db/import/country.feature
@@ -10,38 +10,43 @@ Feature: Country handling
             | osm  | class    | type          | name  | geometry   |
             | N1   | place    | town          | Wenig | country:de |
         When importing
-        When searching for "Wenig, Loudou"
+        When sending search query "Wenig, Loudou"
         Then results contain
-            | osm_type | osm_id | name |
-            | N        | 1      | Wenig, Deutschland |
-        When searching for "Wenig"
+            | osm | display_name |
+            | N1  | Wenig, Deutschland |
+        When sending search query "Wenig"
             | accept-language |
             | xy,en |
         Then results contain
-            | osm_type | osm_id | name |
-            | N        | 1      | Wenig, Loudou |
+            | osm | display_name |
+            | N1  | Wenig, Loudou |
     Scenario: OSM country relations outside expected boundaries are ignored
+        Given the grid
+            | 1 |  | 2 |
+            | 4 |  | 3 |
         Given the places
             | osm  | class    | type           | admin | name+name:xy | country | geometry |
-            | R1   | boundary | administrative | 2     | Loudou       | de      | poly-area:0.1 |
+            | R1   | boundary | administrative | 2     | Loudou       | de      | (1,2,3,4,1) |
         Given the places
             | osm  | class    | type          | name  | geometry   |
             | N1   | place    | town          | Wenig | country:de |
         When importing
-        When searching for "Wenig"
+        When sending search query "Wenig"
             | accept-language |
             | xy,en |
         Then results contain
-            | osm_type | osm_id | name |
-            | N        | 1      | Wenig, Germany |
+            | osm | display_name |
+            | N1  | Wenig, Germany |
     Scenario: Pre-defined country names are used
+        Given the grid with origin CH
+            | 1 |
         Given the places
             | osm  | class    | type          | name  | geometry   |
-            | N1   | place    | town          | Ingb  | country:ch |
+            | N1   | place    | town          | Ingb  | 1          |
         When importing
-        And searching for "Ingb"
+        And sending search query "Ingb"
             | accept-language |
             | en,de |
         Then results contain
-            | osm_type | osm_id | name |
-            | N        | 1      | Ingb, Switzerland |
+            | osm | display_name |
+            | N1  | Ingb, Switzerland |