Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/bdd/db/update/simple.feature b/test/bdd/db/update/simple.feature
index d48e97fa881ff85cff2e9d5331cd7a08f5dfc7a5..ccc42c2a1bff90de228a7bce691b9f4dbfa90059 100644 (file)
--- a/test/bdd/db/update/simple.feature
+++ b/test/bdd/db/update/simple.feature
@@ -28,17 +28,20 @@ Feature: Update of simple objects
 
     Scenario: Do delete large features of low rank
         Given the named places
 
     Scenario: Do delete large features of low rank
         Given the named places

-          | osm | class    | type          | geometry |
-          | W1  | place    | house         | poly-area:5.0 |
-          | R1  | boundary | national_park | poly-area:5.0 |
+          | osm | class    | type        | geometry |
+          | W1  | place    | house       | poly-area:5.0 |
+          | R1  | natural  | wood        | poly-area:5.0 |
+          | R2  | highway  | residential | poly-area:5.0 |

         When importing
         Then placex contains
           | object | rank_address |
           | R1     | 0 |
         When importing
         Then placex contains
           | object | rank_address |
           | R1     | 0 |

+          | R2     | 26 |

           | W1     | 30 |
           | W1     | 30 |

-        When marking for delete R1,W1
+        When marking for delete R1,R2,W1

         Then placex has no entry for W1
         Then placex has no entry for R1
         Then placex has no entry for W1
         Then placex has no entry for R1

+        Then placex has no entry for R2

 
     Scenario: type mutation
         Given the places
 
     Scenario: type mutation
         Given the places


@@ -60,9 +63,7 @@ Feature: Update of simple objects
           | osm | class | type     | postcode | geometry |
           | N3  | place | postcode | 12345    | 1 -1 |
         When importing
           | osm | class | type     | postcode | geometry |
           | N3  | place | postcode | 12345    | 1 -1 |
         When importing

-        Then placex contains
-          | object | class | type |
-          | N3     | place | postcode |
+        Then placex has no entry for N3

         When updating places
           | osm | class | type  | postcode | housenr | geometry |
           | N3  | place | house | 12345    | 13      | 1 -1 |
         When updating places
           | osm | class | type  | postcode | housenr | geometry |
           | N3  | place | house | 12345    | 13      | 1 -1 |