adapt BDD tests for legacy tokenizer + Python frontend

Mostly disables the tests, the cases are not worth fixing anymore.
Others just avoid using terms that trigger abbreviations.

diff --git a/test/bdd/db/query/postcodes.feature b/test/bdd/db/query/postcodes.feature
index 9f0249594a03ce50c0ac7d266479155ef307b9f0..fa4f6a0b486b60df0bae3fef2133e3b5e723a8b6 100644 (file)
--- a/test/bdd/db/query/postcodes.feature
+++ b/test/bdd/db/query/postcodes.feature
@@ -76,6 +76,7 @@ Feature: Querying fo postcode variants
             | AD675    |
 
 
             | AD675    |
 
 

+    @fail-legacy

     Scenario: Different postcodes with the same normalization can both be found
         Given the places
            | osm | class | type  | addr+postcode | addr+housenumber | geometry |
     Scenario: Different postcodes with the same normalization can both be found
         Given the places
            | osm | class | type  | addr+postcode | addr+housenumber | geometry |

diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature
index 5fef313214bf2f2f7ba78d06fe3e0468c857a847..270d2e554757de72d94a61de0561a4c8dd889270 100644 (file)
--- a/test/bdd/db/query/search_simple.feature
+++ b/test/bdd/db/query/search_simple.feature
@@ -77,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 |

diff --git a/test/bdd/db/update/linked_places.feature b/test/bdd/db/update/linked_places.feature
index 9204b3bb04d08870a47c9da17fac946926adcbc2..d6370ebbe731c136780c755e1423c70e5584d413 100644 (file)
--- a/test/bdd/db/update/linked_places.feature
+++ b/test/bdd/db/update/linked_places.feature
@@ -157,17 +157,17 @@ Feature: Updates of linked places
          | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |
         And the places
          | osm | class    | type        | name+name:de |
          | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |
         And the places
          | osm | class    | type        | name+name:de |

-         | N3  | place    | city        | pnt          |
+         | N3  | place    | city        | greeny       |

         And the relations
          | id | members  |
          | 1  | N3:label |
         When importing
         Then placex contains
          | object | linked_place_id | name+_place_name:de |
         And the relations
          | id | members  |
          | 1  | N3:label |
         When importing
         Then placex contains
          | object | linked_place_id | name+_place_name:de |

-         | R1     | -               | pnt  |
+         | R1     | -               | greeny  |

         And placex contains
          | object | linked_place_id | name+name:de |
         And placex contains
          | object | linked_place_id | name+name:de |

-         | N3     | R1              | pnt  |
+         | N3     | R1              | greeny  |

         When updating places
          | osm | class    | type        | name+name:de |
          | N3  | place    | city        | newname      |
         When updating places
          | osm | class    | type        | name+name:de |
          | N3  | place    | city        | newname      |


@@ -188,18 +188,18 @@ Feature: Updates of linked places
          | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |
         And the places
          | osm | class    | type           | name |
          | R1  | boundary | administrative | rel  | 8     | (10,11,12,13,10) |
         And the places
          | osm | class    | type           | name |

-         | N3  | place    | city           | pnt  |
+         | N3  | place    | city           | greeny  |

         And the relations
          | id | members  |
          | 1  | N3:label |
         When importing
         Then placex contains
          | object | linked_place_id | name+_place_name | name+name |
         And the relations
          | id | members  |
          | 1  | N3:label |
         When importing
         Then placex contains
          | object | linked_place_id | name+_place_name | name+name |

-         | R1     | -               | pnt              | rel       |
+         | R1     | -               | greeny              | rel       |

         And placex contains
          | object | linked_place_id | name+name |
         And placex contains
          | object | linked_place_id | name+name |

-         | N3     | R1              | pnt  |
-        When sending search query "pnt"
+         | N3     | R1              | greeny  |
+        When sending search query "greeny"

         Then results contain
           | osm |
           | R1  |
         Then results contain
           | osm |
           | R1  |


@@ -212,7 +212,7 @@ Feature: Updates of linked places
         And placex contains
          | object | linked_place_id | name+_place_name:de | name+name |
          | R1     | -               | depnt               | rel       |
         And placex contains
          | object | linked_place_id | name+_place_name:de | name+name |
          | R1     | -               | depnt               | rel       |

-        When sending search query "pnt"
+        When sending search query "greeny"

         Then exactly 0 results are returned
 
     Scenario: Updating linkee extratags keeps linker's extratags
         Then exactly 0 results are returned
 
     Scenario: Updating linkee extratags keeps linker's extratags