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 195d101e1485b56dda71f1d8788c1705cdeafcef..0ae0ac4a25a0a2376a092ad0b0cb09204b62de63 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     | 30 |
         When importing
         Then placex contains
           | object | rank_address |
           | R1     | 30 |

+          | 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


@@ -103,4 +106,4 @@ Feature: Update of simple objects
           | W1  | boundary | historic       | Haha | 5     | (1, 2, 4, 3, 1) |
         Then placex contains
           | object | rank_address |
           | W1  | boundary | historic       | Haha | 5     | (1, 2, 4, 3, 1) |
         Then placex contains
           | object | rank_address |

-          | W1     | 30            |
+          | W1     | 0            |