enable BDD tests for sqlite databases

[nominatim.git] / test / bdd / steps / http_responses.py

diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py
index ff78754670fa0d4c90a7ba8c6549a6fbd6650db0..2e24ed5043bddf87bcfde92e897a6f95e241674e 100644 (file)
--- a/test/bdd/steps/http_responses.py
+++ b/test/bdd/steps/http_responses.py
@@ -84,7 +84,8 @@ class GenericResponse:
                 assert set(r.keys()) == {'geocoding', 'geojson', '__geocoding'}, \
                        f"Unexpected keys in result: {r.keys()}"
                 check_for_attributes(r['geocoding'], 'geojson', 'absent')
                 assert set(r.keys()) == {'geocoding', 'geojson', '__geocoding'}, \
                        f"Unexpected keys in result: {r.keys()}"
                 check_for_attributes(r['geocoding'], 'geojson', 'absent')

-                r |= r.pop('geocoding')
+                inner = r.pop('geocoding')
+                r.update(inner)

 
 
     def assert_address_field(self, idx, field, value):
 
 
     def assert_address_field(self, idx, field, value):


@@ -133,8 +134,8 @@ class GenericResponse:
                         lon, lat = context.osm.grid_node(int(value))
                     else:
                         raise RuntimeError("Context needed when using grid coordinates")
                         lon, lat = context.osm.grid_node(int(value))
                     else:
                         raise RuntimeError("Context needed when using grid coordinates")

-                    self.check_row_field(i, 'lat', Field(float(lat)), base=subdict)
-                    self.check_row_field(i, 'lon', Field(float(lon)), base=subdict)
+                    self.check_row_field(i, 'lat', Field(float(lat), abs_tol=1e-07), base=subdict)
+                    self.check_row_field(i, 'lon', Field(float(lon), abs_tol=1e-07), base=subdict)

                 else:
                     self.check_row_field(i, name, Field(value), base=subdict)
 
                 else:
                     self.check_row_field(i, name, Field(value), base=subdict)
 


@@ -220,24 +221,33 @@ class ReverseResponse(GenericResponse):
             if child.tag == 'result':
                 assert not self.result, "More than one result in reverse result"
                 self.result.append(dict(child.attrib))
             if child.tag == 'result':
                 assert not self.result, "More than one result in reverse result"
                 self.result.append(dict(child.attrib))

+                check_for_attributes(self.result[0], 'display_name', 'absent')
+                self.result[0]['display_name'] = child.text

             elif child.tag == 'addressparts':
             elif child.tag == 'addressparts':

+                assert 'address' not in self.result[0], "More than one address in result"

                 address = {}
                 for sub in child:
                 address = {}
                 for sub in child:

+                    assert len(sub) == 0, f"Address element '{sub.tag}' has subelements"

                     address[sub.tag] = sub.text
                 self.result[0]['address'] = address
             elif child.tag == 'extratags':
                     address[sub.tag] = sub.text
                 self.result[0]['address'] = address
             elif child.tag == 'extratags':

+                assert 'extratags' not in self.result[0], "More than one extratags in result"

                 self.result[0]['extratags'] = {}
                 for tag in child:
                 self.result[0]['extratags'] = {}
                 for tag in child:

+                    assert len(tag) == 0, f"Extratags element '{tag.attrib['key']}' has subelements"

                     self.result[0]['extratags'][tag.attrib['key']] = tag.attrib['value']
             elif child.tag == 'namedetails':
                     self.result[0]['extratags'][tag.attrib['key']] = tag.attrib['value']
             elif child.tag == 'namedetails':

+                assert 'namedetails' not in self.result[0], "More than one namedetails in result"

                 self.result[0]['namedetails'] = {}
                 for tag in child:
                 self.result[0]['namedetails'] = {}
                 for tag in child:

+                    assert len(tag) == 0, f"Namedetails element '{tag.attrib['desc']}' has subelements"

                     self.result[0]['namedetails'][tag.attrib['desc']] = tag.text
             elif child.tag == 'geokml':
                     self.result[0]['namedetails'][tag.attrib['desc']] = tag.text
             elif child.tag == 'geokml':

-                self.result[0][child.tag] = True
+                assert 'geokml' not in self.result[0], "More than one geokml in result"
+                self.result[0]['geokml'] = ET.tostring(child, encoding='unicode')

             else:
                 assert child.tag == 'error', \
             else:
                 assert child.tag == 'error', \

-                       "Unknown XML tag {} on page: {}".format(child.tag, self.page)
+                       f"Unknown XML tag {child.tag} on page: {self.page}"

 
 
 class StatusResponse(GenericResponse):
 
 
 class StatusResponse(GenericResponse):