X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ad95ff1d067aed8b83579d10dd0c8802803e4a41..2c61fe08a031bd4ccbe47c62c021321e2dff7510:/test/python/mocks.py diff --git a/test/python/mocks.py b/test/python/mocks.py index 32b6e6df..fb7f4fa1 100644 --- a/test/python/mocks.py +++ b/test/python/mocks.py @@ -1,20 +1,16 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2025 by the Nominatim developer community. # For a full list of authors see the git log. """ Custom mocks for testing. """ import itertools -import psycopg2.extras +from nominatim_db.db import properties -from nominatim.db import properties - -# This must always point to the mock word table for the default tokenizer. -from mock_icu_word_table import MockIcuWordTable as MockWordTable class MockPlacexTable: """ A placex table for testing. @@ -56,12 +52,12 @@ class MockPlacexTable: admin_level=None, address=None, extratags=None, geom='POINT(10 4)', country=None, housenumber=None, rank_search=30): with self.conn.cursor() as cur: - psycopg2.extras.register_hstore(cur) cur.execute("""INSERT INTO placex (place_id, osm_type, osm_id, class, type, name, admin_level, address, housenumber, rank_search, extratags, geometry, country_code) - VALUES(nextval('seq_place'), %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""", + VALUES(nextval('seq_place'), %s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, %s)""", (osm_type, osm_id or next(self.idseq), cls, typ, names, admin_level, address, housenumber, rank_search, extratags, 'SRID=4326;' + geom, @@ -75,13 +71,11 @@ class MockPropertyTable: def __init__(self, conn): self.conn = conn - def set(self, name, value): """ Set a property in the table to the given value. """ properties.set_property(self.conn, name, value) - def get(self, name): """ Set a property in the table to the given value. """