X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/86b43dc605cd7e02e08b8c63c90ffe41ab26e3d2..b0067a0345c2ab7793614925d6150141ef5f18f0:/test/python/api/test_results.py diff --git a/test/python/api/test_results.py b/test/python/api/test_results.py index 97d95ac0..54a54549 100644 --- a/test/python/api/test_results.py +++ b/test/python/api/test_results.py @@ -8,6 +8,7 @@ Tests for result datatype helper functions. """ import struct +from binascii import hexlify import pytest import pytest_asyncio @@ -17,13 +18,13 @@ import sqlalchemy as sa from nominatim.api import SourceTable, DetailedResult, Point import nominatim.api.results as nresults -class FakeCentroid: - def __init__(self, x, y): - self.data = struct.pack("=biidd", 1, 0x20000001, 4326, - x, y) +def mkpoint(x, y): + return hexlify(struct.pack("=biidd", 1, 0x20000001, 4326, x, y)).decode('utf-8') class FakeRow: def __init__(self, **kwargs): + if 'parent_place_id' not in kwargs: + kwargs['parent_place_id'] = None for k, v in kwargs.items(): setattr(self, k, v) self._mapping = kwargs @@ -36,7 +37,7 @@ def test_minimal_detailed_result(): assert res.lon == 23.1 assert res.lat == 0.5 - assert res.calculated_importance() == pytest.approx(0.0000001) + assert res.calculated_importance() == pytest.approx(0.00001) def test_detailed_result_custom_importance(): res = DetailedResult(SourceTable.PLACEX, @@ -60,7 +61,7 @@ def test_create_row_none(func): def test_create_row_with_housenumber(func): row = FakeRow(place_id=2345, osm_type='W', osm_id=111, housenumber=4, address=None, postcode='99900', country_code='xd', - centroid=FakeCentroid(0, 0)) + centroid=mkpoint(0, 0)) res = func(row, DetailedResult) @@ -75,7 +76,7 @@ def test_create_row_without_housenumber(func): row = FakeRow(place_id=2345, osm_type='W', osm_id=111, startnumber=1, endnumber=11, step=2, address=None, postcode='99900', country_code='xd', - centroid=FakeCentroid(0, 0)) + centroid=mkpoint(0, 0)) res = func(row, DetailedResult)