Merge pull request #3591 from lonvia/increase-required-postgresql

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

diff --git a/test/bdd/osm2pgsql/update/simple.feature b/test/bdd/osm2pgsql/update/simple.feature
index 33c21039e1425a5a4dc4487407de86a643d2720e..5a86917c3036c95278fbce44934750eef9fce8aa 100644 (file)
--- a/test/bdd/osm2pgsql/update/simple.feature
+++ b/test/bdd/osm2pgsql/update/simple.feature
@@ -2,25 +2,48 @@
 Feature: Update of simple objects by osm2pgsql
     Testing basic update functions of osm2pgsql.
 
 Feature: Update of simple objects by osm2pgsql
     Testing basic update functions of osm2pgsql.
 

-    Scenario: Import object with two main tags
+    Scenario: Adding a new object

         When loading osm data
           """
         When loading osm data
           """

-          n1 Ttourism=hotel,amenity=restaurant,name=foo
-          n2 Tplace=locality,name=spotty
+          n1 Tplace=town,name=Middletown

           """
           """

-        Then place contains
-          | object     | type       | name
-          | N1:tourism | hotel      | 'name' : 'foo'
-          | N1:amenity | restaurant | 'name' : 'foo'
-          | N2:place   | locality   | 'name' : 'spotty'
-        When updating osm data
+        Then place contains exactly
+          | object   | type | name+name  |
+          | N1:place | town | Middletown |
+
+       When updating osm data
+         """
+         n2 Tamenity=hotel,name=Posthotel
+         """
+        Then place contains exactly
+          | object     | type  | name+name  |
+          | N1:place   | town  | Middletown |
+          | N2:amenity | hotel | Posthotel  |
+        And placex contains exactly
+          | object     | type  | name+name  | indexed_status |
+          | N1:place   | town  | Middletown | 0              |
+          | N2:amenity | hotel | Posthotel  | 1              |
+
+
+    Scenario: Deleting an existing object
+        When loading osm data

           """
           """

-          n1 dV Ttourism=hotel,name=foo
-          n2 dD
+          n1 Tplace=town,name=Middletown
+          n2 Tamenity=hotel,name=Posthotel

           """
           """

-        Then place has no entry for N1:amenity
-        And place has no entry for N2
-        And place contains
-          | object     | class   | type       | name
-          | N1:tourism | tourism | hotel      | 'name' : 'foo'
+        Then place contains exactly
+          | object     | type  | name+name  |
+          | N1:place   | town  | Middletown |
+          | N2:amenity | hotel | Posthotel  |

 
 

+       When updating osm data
+         """
+         n2 dD
+         """
+        Then place contains exactly
+          | object     | type  | name+name  |
+          | N1:place   | town  | Middletown |
+        And placex contains exactly
+          | object     | type  | name+name  | indexed_status |
+          | N1:place   | town  | Middletown | 0              |
+          | N2:amenity | hotel | Posthotel  | 100            |