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 3672bb898af3c979a7f3fab8e8b66bd45adad17b..270d2e554757de72d94a61de0561a4c8dd889270 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,7 +26,7 @@ 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"
         Then exactly 0 results are returned
         When sending search query "54321"
         And sending search query "12345"
         Then exactly 0 results are returned
         When sending search query "54321"


@@ -74,6 +77,7 @@ Feature: Searching of simple objects
          | W1  |
 
 
          | W1  |
 
 

+     @fail-legacy

      Scenario Outline: Special cased american states will be found
         Given the grid
          | 1 |    | 2 |
      Scenario Outline: Special cased american states will be found
         Given the grid
          | 1 |    | 2 |