X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4f2d73aa7c185af5546094449355580d3564cdc6..635ce30db5a5086a5881fdc766f0dc450677bf62:/test/bdd/steps/db_ops.py

diff --git a/test/bdd/steps/db_ops.py b/test/bdd/steps/db_ops.py
index b7fa1a88..3c5c5632 100644
--- a/test/bdd/steps/db_ops.py
+++ b/test/bdd/steps/db_ops.py
@@ -118,14 +118,17 @@ def assert_db_column(row, column, value, context):
     if column.startswith('centroid'):
         fac = float(column[9:]) if column.startswith('centroid*') else 1.0
         x, y = value.split(' ')
-        assert_almost_equal(float(x) * fac, row['cx'])
-        assert_almost_equal(float(y) * fac, row['cy'])
+        assert_almost_equal(float(x) * fac, row['cx'], "Bad x coordinate")
+        assert_almost_equal(float(y) * fac, row['cy'], "Bad y coordinate")
     elif column == 'geometry':
         geom = context.osm.parse_geometry(value, context.scene)
         cur = context.db.cursor()
-        cur.execute("SELECT ST_Equals(%s, ST_SetSRID(%%s::geometry, 4326))" % geom,
-                    (row['geomtxt'],))
-        eq_(cur.fetchone()[0], True)
+        query = "SELECT ST_Equals(ST_SnapToGrid(%s, 0.00001, 0.00001), ST_SnapToGrid(ST_SetSRID('%s'::geometry, 4326), 0.00001, 0.00001))" % (
+                 geom, row['geomtxt'],)
+        cur.execute(query)
+        eq_(cur.fetchone()[0], True, "(Row %s failed: %s)" % (column, query))
+    elif value == '-':
+        assert_is_none(row[column], "Row %s" % column)
     else:
         eq_(value, str(row[column]),
             "Row '%s': expected: %s, got: %s"
@@ -258,6 +261,7 @@ def check_placex_contents(context, exact):
                        ST_X(centroid) as cx, ST_Y(centroid) as cy
                        FROM placex where %s""" % where,
                     params)
+        assert_less(0, cur.rowcount, "No rows found for " + row['object'])
 
         for res in cur:
             if exact:
@@ -286,6 +290,52 @@ def check_placex_contents(context, exact):
 
     context.db.commit()
 
+@then("place contains(?P<exact> exactly)?")
+def check_placex_contents(context, exact):
+    cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
+
+    expected_content = set()
+    for row in context.table:
+        nid = NominatimID(row['object'])
+        where, params = nid.table_select()
+        cur.execute("""SELECT *, ST_AsText(geometry) as geomtxt,
+                       ST_GeometryType(geometry) as geometrytype
+                       FROM place where %s""" % where,
+                    params)
+        assert_less(0, cur.rowcount, "No rows found for " + row['object'])
+
+        for res in cur:
+            if exact:
+                expected_content.add((res['osm_type'], res['osm_id'], res['class']))
+            for h in row.headings:
+                msg = "%s: %s" % (row['object'], h)
+                if h in ('name', 'extratags'):
+                    if row[h] == '-':
+                        assert_is_none(res[h], msg)
+                    else:
+                        vdict = eval('{' + row[h] + '}')
+                        assert_equals(vdict, res[h], msg)
+                elif h.startswith('name+'):
+                    assert_equals(res['name'][h[5:]], row[h], msg)
+                elif h.startswith('extratags+'):
+                    assert_equals(res['extratags'][h[10:]], row[h], msg)
+                elif h in ('linked_place_id', 'parent_place_id'):
+                    if row[h] == '0':
+                        assert_equals(0, res[h], msg)
+                    elif row[h] == '-':
+                        assert_is_none(res[h], msg)
+                    else:
+                        assert_equals(NominatimID(row[h]).get_place_id(context.db.cursor()),
+                                      res[h], msg)
+                else:
+                    assert_db_column(res, h, row[h], context)
+
+    if exact:
+        cur.execute('SELECT osm_type, osm_id, class from place')
+        eq_(expected_content, set([(r[0], r[1], r[2]) for r in cur]))
+
+    context.db.commit()
+
 @then("search_name contains")
 def check_search_name_contents(context):
     cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
@@ -294,6 +344,7 @@ def check_search_name_contents(context):
         pid = NominatimID(row['object']).get_place_id(cur)
         cur.execute("""SELECT *, ST_X(centroid) as cx, ST_Y(centroid) as cy
                        FROM search_name WHERE place_id = %s""", (pid, ))
+        assert_less(0, cur.rowcount, "No rows found for " + row['object'])
 
         for res in cur:
             for h in row.headings:
@@ -357,12 +408,12 @@ def check_location_property_osmline(context, oid, neg):
     eq_(todo, [])
 
 
-@then("placex has no entry for (?P<oid>.*)")
-def check_placex_has_entry(context, oid):
+@then("(?P<table>placex|place) has no entry for (?P<oid>.*)")
+def check_placex_has_entry(context, table, oid):
     cur = context.db.cursor(cursor_factory=psycopg2.extras.DictCursor)
     nid = NominatimID(oid)
     where, params = nid.table_select()
-    cur.execute("SELECT * FROM placex where %s" % where, params)
+    cur.execute("SELECT * FROM %s where %s" % (table, where), params)
     eq_(0, cur.rowcount)
     context.db.commit()