Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / db / import / parenting.feature

diff --git a/test/bdd/db/import/parenting.feature b/test/bdd/db/import/parenting.feature
index c00f47016f23af13afbbedc9b35f7e450b121090..87467fd287a22603d2c1c10f9c8384adfcba6f26 100644 (file)
--- a/test/bdd/db/import/parenting.feature
+++ b/test/bdd/db/import/parenting.feature
@@ -1,6 +1,6 @@
 @DB
 Feature: Parenting of objects
 @DB
 Feature: Parenting of objects

-    Tests that the correct parent is choosen
+    Tests that the correct parent is chosen

 
     Scenario: Address inherits postcode from its street unless it has a postcode
         Given the scene roads-with-pois
 
     Scenario: Address inherits postcode from its street unless it has a postcode
         Given the scene roads-with-pois


@@ -18,10 +18,14 @@ Feature: Parenting of objects
          | object | parent_place_id |
          | N1     | W1 |
          | N2     | W1 |
          | object | parent_place_id |
          | N1     | W1 |
          | N2     | W1 |

-        And search_name contains
-         | object | nameaddress_vector |
-         | N1     | 4, galoo, 12345 |
-         | N2     | 5, galoo, 99999 |
+        When searching for "4 galoo"
+        Then results contain
+         | ID | osm_type | osm_id | langaddress |
+         | 0  | N        | 1      | 4, galoo, 12345 |
+        When searching for "5 galoo"
+        Then results contain
+         | ID | osm_type | osm_id | langaddress |
+         | 0  | N        | 2      | 5, galoo, 99999 |

 
     Scenario: Address without tags, closest street
         Given the scene roads-with-pois
 
     Scenario: Address without tags, closest street
         Given the scene roads-with-pois


@@ -321,11 +325,11 @@ Feature: Parenting of objects
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains

-         | object | parent_place_id | street | addr_place | housenumber |
-         | W1     | W3              | foo    | nowhere    | 3 |
-         | N1     | W3              | foo    | nowhere    | 3 |
-         | N2     | W3              | foo    | nowhere    | 3 |
-         | N3     | W3              | foo    | nowhere    | 3 |
+         | object | parent_place_id | housenumber |
+         | W1     | W3              | 3 |
+         | N1     | W3              | 3 |
+         | N2     | W3              | 3 |
+         | N3     | W3              | 3 |

 
     Scenario: POIs don't inherit from streets
         Given the scene building-on-street-corner
 
     Scenario: POIs don't inherit from streets
         Given the scene building-on-street-corner


@@ -340,8 +344,8 @@ Feature: Parenting of objects
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains

-         | object | parent_place_id | street | addr_place | housenumber |
-         | N1     | W3              | None   | None       | None |
+         | object | parent_place_id | housenumber |
+         | N1     | W3              | None |

 
     Scenario: POIs with own address do not inherit building address
         Given the scene building-on-street-corner
 
     Scenario: POIs with own address do not inherit building address
         Given the scene building-on-street-corner


@@ -366,11 +370,11 @@ Feature: Parenting of objects
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains
          | W3  | highway  | residential | foo  | :w-NS |
         When importing
         Then placex contains

-         | object | parent_place_id | street | addr_place | housenumber |
-         | W1     | N4              | None   | theplace   | 3 |
-         | N1     | W2              | bar    | None       | None |
-         | N2     | W3              | None   | None       | 4 |
-         | N3     | W2              | None   | nowhere    | None |
+         | object | parent_place_id | housenumber |
+         | W1     | N4              | 3 |
+         | N1     | W2              | None |
+         | N2     | W3              | 4 |
+         | N3     | W2              | None |

 
     Scenario: POIs parent a road if they are attached to it
         Given the scene points-on-roads
 
     Scenario: POIs parent a road if they are attached to it
         Given the scene points-on-roads