Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/update/postcode.feature b/test/bdd/db/update/postcode.feature
index 94550ffd6b3f764a0687a8ae628eb154feacdb75..c6696ddae8d86090e991cb545d43f4c145cad96a 100644 (file)
--- a/test/bdd/db/update/postcode.feature
+++ b/test/bdd/db/update/postcode.feature
@@ -18,10 +18,7 @@ Feature: Update of postcode
            | country | postcode | geometry |
            | de      | 01982    | country:de |
            | ch      | 4567     | country:ch |
            | country | postcode | geometry |
            | de      | 01982    | country:de |
            | ch      | 4567     | country:ch |

-        And word contains
-           | word  | class | type |
-           | 01982 | place | postcode |
-           | 4567  | place | postcode |
+        And there are word tokens for postcodes 01982,4567

 
      Scenario: When the last postcode is deleted, it is deleted from postcode and word
         Given the places
 
      Scenario: When the last postcode is deleted, it is deleted from postcode and word
         Given the places


@@ -34,27 +31,21 @@ Feature: Update of postcode
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | ch      | 4567     | country:ch |
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | ch      | 4567     | country:ch |

-        And word contains not
-           | word  | class | type |
-           | 01982 | place | postcode |
-        And word contains
-           | word  | class | type |
-           | 4567  | place | postcode |
+        And there are word tokens for postcodes 4567
+        And there are no word tokens for postcodes 01982

 
      Scenario: A postcode is not deleted from postcode and word when it exist in another country
         Given the places
            | osm | class | type  | addr+postcode | addr+housenumber | geometry |
            | N34 | place | house | 01982         | 111              |country:de |
 
      Scenario: A postcode is not deleted from postcode and word when it exist in another country
         Given the places
            | osm | class | type  | addr+postcode | addr+housenumber | geometry |
            | N34 | place | house | 01982         | 111              |country:de |

-           | N35 | place | house | 01982         | 5                |country:ch |
+           | N35 | place | house | 01982         | 5                |country:fr |

         When importing
         And marking for delete N34
         And updating postcodes
         Then location_postcode contains exactly
            | country | postcode | geometry |
         When importing
         And marking for delete N34
         And updating postcodes
         Then location_postcode contains exactly
            | country | postcode | geometry |

-           | ch      | 01982    | country:ch |
-        And word contains
-           | word  | class | type |
-           | 01982 | place | postcode |
+           | fr      | 01982    | country:fr |
+        And there are word tokens for postcodes 01982

 
      Scenario: Updating a postcode is reflected in postcode table
         Given the places
 
      Scenario: Updating a postcode is reflected in postcode table
         Given the places


@@ -68,9 +59,7 @@ Feature: Update of postcode
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 20453    | country:de |
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 20453    | country:de |

-        And word contains
-           | word  | class | type |
-           | 20453 | place | postcode |
+        And there are word tokens for postcodes 20453

 
      Scenario: When changing from a postcode type, the entry appears in placex
         When importing
 
      Scenario: When changing from a postcode type, the entry appears in placex
         When importing


@@ -91,9 +80,7 @@ Feature: Update of postcode
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 20453    | country:de |
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 20453    | country:de |

-        And word contains
-           | word  | class | type |
-           | 20453 | place | postcode |
+        And there are word tokens for postcodes 20453

 
      Scenario: When changing to a postcode type, the entry disappears from placex
         When importing
 
      Scenario: When changing to a postcode type, the entry disappears from placex
         When importing


@@ -114,6 +101,4 @@ Feature: Update of postcode
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 01982    | country:de |
         Then location_postcode contains exactly
            | country | postcode | geometry |
            | de      | 01982    | country:de |

-        And word contains
-           | word  | class | type |
-           | 01982 | place | postcode |
+        And there are word tokens for postcodes 01982