Merge pull request #3493 from lonvia/clean-up-bdd-tests

[nominatim.git] / test / bdd / db / update / country.feature

diff --git a/test/bdd/db/update/country.feature b/test/bdd/db/update/country.feature
index 2085e4e5c5bd552887e568c99f068e17643c7c38..794b0d0e2be5630f76ef7e8dd63ce9f7490096c3 100644 (file)
--- a/test/bdd/db/update/country.feature
+++ b/test/bdd/db/update/country.feature
@@ -2,41 +2,47 @@
 Feature: Country handling
     Tests for update of country information
 
+    Background:
+        Given the 1.0 grid with origin DE
+            | 1 |    | 2 |
+            |   | 10 |   |
+            | 4 |    | 3 |
+
     @fail-legacy
     Scenario: When country names are changed old ones are no longer searchable
         Given the places
-            | osm  | class    | type           | admin | name+name:xy | country | geometry |
-            | R1   | boundary | administrative | 2     | Loudou       | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:xy | country | geometry |
+            | 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 |
+            | osm | class    | type          | name  |
+            | N10 | place    | town          | Wenig |
         When importing
         When sending search query "Wenig, Loudou"
         Then results contain
             | osm |
-            | N1  |
+            | N10 |
         When updating places
-            | osm  | class    | type           | admin | name+name:xy | country | geometry |
-            | R1   | boundary | administrative | 2     | Germany      | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:xy | country | geometry |
+            | R1  | boundary | administrative | 2     | Germany      | de      | (1,2,3,4,1) |
         When sending search query "Wenig, Loudou"
         Then exactly 0 results are returned
 
     @fail-legacy
     Scenario: When country names are deleted they are no longer searchable
         Given the places
-            | osm  | class    | type           | admin | name+name:xy | country | geometry |
-            | R1   | boundary | administrative | 2     | Loudou       | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:xy | country | geometry |
+            | 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 |
+            | osm | class    | type          | name  |
+            | N10 | place    | town          | Wenig |
         When importing
         When sending search query "Wenig, Loudou"
         Then results contain
             | osm |
-            | N1  |
+            | N10 |
         When updating places
-            | osm  | class    | type           | admin | name+name:en | country | geometry |
-            | R1   | boundary | administrative | 2     | Germany      | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:en | country | geometry |
+            | R1  | boundary | administrative | 2     | Germany      | de      | (1,2,3,4,1) |
         When sending search query "Wenig, Loudou"
         Then exactly 0 results are returned
         When sending search query "Wenig"
@@ -44,47 +50,57 @@ Feature: Country handling
             | xy,en |
         Then results contain
             | osm | display_name |
-            | N1  | Wenig, Germany |
+            | N10 | Wenig, Germany |
 
 
     Scenario: Default country names are always searchable
         Given the places
-            | osm  | class    | type          | name  | geometry   |
-            | N1   | place    | town          | Wenig | country:de |
+            | osm | class    | type          | name  |
+            | N10 | place    | town          | Wenig |
         When importing
         When sending search query "Wenig, Germany"
         Then results contain
             | osm |
-            | N1  |
+            | N10 |
+        When sending search query "Wenig, de"
+        Then results contain
+            | osm |
+            | N10 |
         When updating places
             | osm  | class    | type           | admin | name+name:en | country | geometry |
-            | R1   | boundary | administrative | 2     | Lilly        | de      | (9 52, 9 53, 10 52, 9 52) |
+            | R1   | boundary | administrative | 2     | Lilly        | de      | (1,2,3,4,1) |
         When sending search query "Wenig, Germany"
             | accept-language |
             | en,de |
         Then results contain
             | osm | display_name |
-            | N1  | Wenig, Lilly |
+            | N10 | Wenig, Lilly |
+        When sending search query "Wenig, de"
+            | accept-language |
+            | en,de |
+        Then results contain
+            | osm | display_name |
+            | N10 | Wenig, Lilly |
 
 
     @fail-legacy
     Scenario: When a localised name is deleted, the standard name takes over
         Given the places
-            | osm  | class    | type           | admin | name+name:de | country | geometry |
-            | R1   | boundary | administrative | 2     | Loudou       | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:de | country | geometry |
+            | 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 |
+            | osm | class    | type          | name  |
+            | N10 | place    | town          | Wenig |
         When importing
         When sending search query "Wenig, Loudou"
             | accept-language |
             | de,en |
         Then results contain
             | osm | display_name |
-            | N1  | Wenig, Loudou |
+            | N10 | Wenig, Loudou |
         When updating places
-            | osm  | class    | type           | admin | name+name:en | country | geometry |
-            | R1   | boundary | administrative | 2     | Germany      | de      | (9 52, 9 53, 10 52, 9 52) |
+            | osm | class    | type           | admin | name+name:en | country | geometry |
+            | R1  | boundary | administrative | 2     | Germany      | de      | (1,2,3,4,1) |
         When sending search query "Wenig, Loudou"
         Then exactly 0 results are returned
         When sending search query "Wenig"
@@ -92,5 +108,5 @@ Feature: Country handling
             | de,en |
         Then results contain
             | osm | display_name |
-            | N1  | Wenig, Deutschland |
+            | N10 | Wenig, Deutschland |