X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/37afa2180b39a8c33092ef9f9424fcf70843e47e..ef1b52eee517d826c7c0e664f9a539b8ceffaaf6:/test/python/mocks.py diff --git a/test/python/mocks.py b/test/python/mocks.py index 17b76052..a2fff677 100644 --- a/test/python/mocks.py +++ b/test/python/mocks.py @@ -1,3 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# This file is part of Nominatim. (https://nominatim.org) +# +# Copyright (C) 2022 by the Nominatim developer community. +# For a full list of authors see the git log. """ Custom mocks for testing. """ @@ -8,7 +14,7 @@ import psycopg2.extras from nominatim.db import properties # This must always point to the mock word table for the default tokenizer. -from mock_legacy_word_table import MockLegacyWordTable as MockWordTable +from mock_icu_word_table import MockIcuWordTable as MockWordTable class MockPlacexTable: """ A placex table for testing. @@ -36,6 +42,7 @@ class MockPlacexTable: admin_level smallint, address hstore, extratags hstore, + token_info jsonb, geometry Geometry(Geometry,4326), wikipedia TEXT, country_code varchar(2), @@ -47,15 +54,16 @@ class MockPlacexTable: def add(self, osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None, admin_level=None, address=None, extratags=None, geom='POINT(10 4)', - country=None): + country=None, housenumber=None): 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, extratags, geometry, country_code) - VALUES(nextval('seq_place'), %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)""", (osm_type, osm_id or next(self.idseq), cls, typ, names, - admin_level, address, extratags, 'SRID=4326;' + geom, + admin_level, address, housenumber, extratags, 'SRID=4326;' + geom, country)) self.conn.commit() @@ -71,3 +79,9 @@ class MockPropertyTable: """ 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. + """ + return properties.get_property(self.conn, name)