Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / api / search / queries.feature

diff --git a/test/bdd/api/search/queries.feature b/test/bdd/api/search/queries.feature
index cf5a00c9c093ebb37be08bc43d9a8b4b726114f4..fea4da41dd1d78d020fdcda48d3b1a89c1b437e6 100644 (file)
--- a/test/bdd/api/search/queries.feature
+++ b/test/bdd/api/search/queries.feature
@@ -10,6 +10,7 @@ Feature: Search queries
           | type         | value |
           | house_number | 2 |
           | hamlet       | Steinwald |
+          | village      | Göfis |
           | postcode     | 6811 |
           | country      | Austria |
           | country_code | at |
@@ -18,14 +19,12 @@ 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 |
-          | neighbourhood | Auenviertel |
-          | suburb        | Eilbek |
           | postcode      | 22089 |
-          | city_district | Wandsbek |
+          | city          | Hamburg |
           | country       | Deutschland |
           | country_code  | de |
 
@@ -33,14 +32,12 @@ 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 |
-          | neighbourhood | Auenviertel |
-          | suburb        | Eilbek |
           | postcode      | 22089 |
-          | city_district | Wandsbek |
+          | city          | Hamburg |
           | country       | Deutschland |
           | country_code  | de |
 
@@ -55,6 +52,22 @@ Feature: Search queries
           | country      | Uruguay |
           | country_code | uy |
 
+    Scenario Outline: Housenumber 0 can be found
+        When sending <format> search query "Pham Hung Road 0" with address
+        Then results contain
+          | display_name |
+          | ^.*, 0,.* |
+        And result addresses contain
+          | house_number |
+          | 0     |
+
+    Examples:
+        | format |
+        | xml |
+        | json |
+        | jsonv2 |
+        | geojson |
+
     @Tiger
     Scenario: TIGER house number
         When sending json search query "323 22nd Street Southwest, Huron"
@@ -147,3 +160,31 @@ Feature: Search queries
           | 0  | 6395 |
           | 1  | 6395 BIS |
 
+    Scenario Outline: Same Searches with white spaces 
+        When sending json search query "<data>"
+        Then exactly 1 result is returned
+        And results contain
+          | class   |
+          | building |
+
+    Examples:
+      | data |
+      | amerlugalpe, N 47.15739° E 9.61264° |
+      | amerlugalpe,   N 47.15739° E 9.61264° |
+      |        amerlugalpe     ,       N 47.15739° E 9.61264° |
+      | amerlugalpe, N 47.15739°              E 9.61264° |
+      | amerlugalpe\v, N 47.15739° E   9.61264° |
+
+    Scenario: Searched with white spaces
+        When sending json search query "22nd   Street Southwest\v,\fHuron"
+        Then results contain
+          | class   | type |
+          | highway | residential |
+
+
+    # github #1949
+    Scenario: Addressdetails always return the place type
+       When sending json search query "Rotherbaum" with address
+       Then result addresses contain
+         | ID | suburb |
+         | 0  | Rotherbaum |