From: Sarah Hoffmann Date: Sun, 27 Nov 2016 13:44:21 +0000 (+0100) Subject: add remaining db update tests X-Git-Tag: v3.0.0~85^2~16 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/21a3fc4b0fa98e591a8114b684db69059eb9d26a add remaining db update tests --- diff --git a/test/bdd/db/query/search_simple.feature b/test/bdd/db/query/search_simple.feature index f0c66f13..417df769 100644 --- a/test/bdd/db/query/search_simple.feature +++ b/test/bdd/db/query/search_simple.feature @@ -11,3 +11,22 @@ Feature: Searching of simple objects Then results contain | ID | osm | class | type | centroid | | 0 | N1 | place | village | 10 -10 | + + Scenario: Updating postcode in postcode boundaries without ref + Given the places + | osm | class | type | postcode | geometry | + | R1 | boundary | postal_code | 12345 | poly-area:1.0 | + When importing + And searching for "12345" + Then results contain + | ID | osm_type | osm_id | + | 0 | R | 1 | + When updating places + | osm | class | type | postcode | geometry | + | R1 | boundary | postal_code | 54321 | poly-area:1.0 | + And searching for "12345" + Then exactly 0 results are returned + When searching for "54321" + Then results contain + | ID | osm_type | osm_id | + | 0 | R | 1 | diff --git a/test/bdd/db/update/naming.feature b/test/bdd/db/update/naming.feature new file mode 100644 index 00000000..4b5222fc --- /dev/null +++ b/test/bdd/db/update/naming.feature @@ -0,0 +1,18 @@ +@DB +Feature: Update of names in place objects + Test all naming related issues in updates + + Scenario: Delete postcode from postcode boundaries without ref + Given the places + | osm | class | type | postcode | geometry | + | R1 | boundary | postal_code | 12345 | poly-area:0.5 | + When importing + And searching for "12345" + Then results contain + | ID | osm_type | osm_id | + | 0 | R | 1 | + When updating places + | osm | class | type | geometry | + | R1 | boundary | postal_code | poly-area:0.5 | + Then placex has no entry for R1 + diff --git a/test/bdd/db/update/poi-inherited-postcode.feature b/test/bdd/db/update/poi-inherited-postcode.feature new file mode 100644 index 00000000..1b2065e6 --- /dev/null +++ b/test/bdd/db/update/poi-inherited-postcode.feature @@ -0,0 +1,57 @@ +@DB +Feature: Update of POI-inherited poscode + Test updates of postcodes on street which was inherited from a related POI + + Background: Street and house with postcode + Given the scene roads-with-pois + And the places + | osm | class | type | housenr | postcode | street | geometry | + | N1 | place | house | 1 | 12345 | North St |:p-S1 | + And the places + | osm | class | type | name | geometry | + | W1 | highway | residential | North St | :w-north | + When importing + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + + Scenario: POI-inherited postcode remains when way type is changed + When updating places + | osm | class | type | name | geometry | + | W1 | highway | unclassified | North St | :w-north | + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + + Scenario: POI-inherited postcode remains when way name is changed + When updating places + | osm | class | type | name | geometry | + | W1 | highway | unclassified | South St | :w-north | + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + + Scenario: POI-inherited postcode remains when way geometry is changed + When updating places + | osm | class | type | name | geometry | + | W1 | highway | unclassified | South St | :w-south | + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + + Scenario: POI-inherited postcode is added when POI postcode changes + When updating places + | osm | class | type | housenr | postcode | street | geometry | + | N1 | place | house | 1 | 54321 | North St |:p-S1 | + Then search_name contains + | object | nameaddress_vector | + | W1 | 54321 | + + Scenario: POI-inherited postcode remains when POI geometry changes + When updating places + | osm | class | type | housenr | postcode | street | geometry | + | N1 | place | house | 1 | 12345 | North St |:p-S2 | + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + diff --git a/test/bdd/db/update/search_terms.feature b/test/bdd/db/update/search_terms.feature new file mode 100644 index 00000000..07dbd451 --- /dev/null +++ b/test/bdd/db/update/search_terms.feature @@ -0,0 +1,21 @@ +@DB +Feature: Update of search terms + Tests that search_name table is updated correctly + + Scenario: POI-inherited postcode remains when another POI is deleted + Given the scene roads-with-pois + And the places + | osm | class | type | housenr | postcode | street | geometry | + | N1 | place | house | 1 | 12345 | North St |:p-S1 | + | N2 | place | house | 2 | | North St |:p-S2 | + And the places + | osm | class | type | name | geometry | + | W1 | highway | residential | North St | :w-north | + When importing + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 | + When marking for delete N2 + Then search_name contains + | object | nameaddress_vector | + | W1 | 12345 |