Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / query / search_simple.feature

diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature
index 8c19fb7d3370bbab9dbf99d3482f4bdda1436aa3..5fef313214bf2f2f7ba78d06fe3e0468c857a847 100644 (file)
--- a/test/bdd/db/query/search_simple.feature
+++ b/test/bdd/db/query/search_simple.feature
@@ -13,9 +13,12 @@ Feature: Searching of simple objects
          | 0  | N1  | place    | village | 10 -10   |
 
      Scenario: Updating postcode in postcode boundaries without ref
          | 0  | N1  | place    | village | 10 -10   |
 
      Scenario: Updating postcode in postcode boundaries without ref

+        Given the grid
+          | 1 | 2 |
+          | 4 | 3 |

         Given the places
           | osm | class    | type        | postcode | geometry |
         Given the places
           | osm | class    | type        | postcode | geometry |

-          | R1  | boundary | postal_code | 12345    | poly-area:1.0 |
+          | R1  | boundary | postal_code | 12345    | (1,2,3,4,1) |

         When importing
         And sending search query "12345"
         Then results contain
         When importing
         And sending search query "12345"
         Then results contain


@@ -23,9 +26,9 @@ Feature: Searching of simple objects
          | 0  | R1 |
         When updating places
           | osm | class    | type        | postcode | geometry |
          | 0  | R1 |
         When updating places
           | osm | class    | type        | postcode | geometry |

-          | R1  | boundary | postal_code | 54321    | poly-area:1.0 |
+          | R1  | boundary | postal_code | 54321    | (1,2,3,4,1) |

         And sending search query "12345"
         And sending search query "12345"

-        Then result 0 has not attributes osm_type
+        Then exactly 0 results are returned

         When sending search query "54321"
         Then results contain
          | ID | osm |
         When sending search query "54321"
         Then results contain
          | ID | osm |


@@ -61,7 +64,7 @@ Feature: Searching of simple objects
          | osm |
          | N20 |
 
          | osm |
          | N20 |
 

-     Scenario: when the housenumber is missing the stret is still returned
+     Scenario: when the housenumber is missing the street is still returned

         Given the grid
          | 1 |  | 2 |
         Given the places
         Given the grid
          | 1 |  | 2 |
         Given the places


@@ -72,3 +75,34 @@ Feature: Searching of simple objects
         Then results contain
          | osm |
          | W1  |
         Then results contain
          | osm |
          | W1  |

+
+
+     Scenario Outline: Special cased american states will be found
+        Given the grid
+         | 1 |    | 2 |
+         |   | 10 |   |
+         | 4 |    | 3 |
+        Given the places
+         | osm  | class    | type           | admin | name    | name+ref | geometry    |
+         | R1   | boundary | administrative | 4     | <state> | <ref>    | (1,2,3,4,1) |
+        Given the places
+         | osm  | class | type  | name   | geometry    |
+         | N2   | place | town  | <city> | 10          |
+         | N3   | place | city  | <city>  | country:ca  |
+        When importing
+        And sending search query "<city>, <state>"
+        Then results contain
+         | osm |
+         | N2  |
+        When sending search query "<city>, <ref>"
+         | accept-language |
+         | en |
+        Then results contain
+         | osm |
+         | N2  |
+
+     Examples:
+        | city        | state     | ref |
+        | Chicago     | Illinois  | IL  |
+        | Auburn      | Alabama   | AL  |
+        | New Orleans | Louisiana | LA  |