X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c70dfccacac90a90bfc193f49262abe7505d7d75..78f839fbd3ccc623b64895059b440e355c06c7c3:/test/bdd/steps/http_responses.py diff --git a/test/bdd/steps/http_responses.py b/test/bdd/steps/http_responses.py index c28c4e1c..f803a45f 100644 --- a/test/bdd/steps/http_responses.py +++ b/test/bdd/steps/http_responses.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2023 by the Nominatim developer community. +# Copyright (C) 2025 by the Nominatim developer community. # For a full list of authors see the git log. """ Classes wrapping HTTP responses from the Nominatim API. @@ -45,7 +45,6 @@ class GenericResponse: else: self.result = [self.result] - def _parse_geojson(self): self._parse_json() if self.result: @@ -76,7 +75,6 @@ class GenericResponse: new['__' + k] = v self.result.append(new) - def _parse_geocodejson(self): self._parse_geojson() if self.result: @@ -87,7 +85,6 @@ class GenericResponse: inner = r.pop('geocoding') r.update(inner) - def assert_address_field(self, idx, field, value): """ Check that result rows`idx` has a field `field` with value `value` in its address. If idx is None, then all results are checked. @@ -103,7 +100,6 @@ class GenericResponse: address = self.result[idx]['address'] self.check_row_field(idx, field, value, base=address) - def match_row(self, row, context=None, field=None): """ Match the result fields against the given behave table row. """ @@ -139,7 +135,6 @@ class GenericResponse: else: self.check_row_field(i, name, Field(value), base=subdict) - def check_row(self, idx, check, msg): """ Assert for the condition 'check' and print 'msg' on fail together with the contents of the failing result. @@ -154,7 +149,6 @@ class GenericResponse: assert check, _RowError(self.result[idx]) - def check_row_field(self, idx, field, expected, base=None): """ Check field 'field' of result 'idx' for the expected value and print a meaningful error if the condition fails. @@ -172,7 +166,6 @@ class GenericResponse: f"\nBad value for field '{field}'. Expected: {expected}, got: {value}") - class SearchResponse(GenericResponse): """ Specialised class for search and lookup responses. Transforms the xml response in a format similar to json. @@ -240,7 +233,8 @@ class ReverseResponse(GenericResponse): assert 'namedetails' not in self.result[0], "More than one namedetails in result" self.result[0]['namedetails'] = {} for tag in child: - assert len(tag) == 0, f"Namedetails element '{tag.attrib['desc']}' has subelements" + 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': assert 'geokml' not in self.result[0], "More than one geokml in result"