X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8ea7e043634457b4b588ed53c310c94885fc105a..3676310efea43835142118d821603d9af923f7df:/test/python/test_db_properties.py diff --git a/test/python/test_db_properties.py b/test/python/test_db_properties.py index 9621c68c..b17d41ea 100644 --- a/test/python/test_db_properties.py +++ b/test/python/test_db_properties.py @@ -6,26 +6,32 @@ import pytest from nominatim.db import properties @pytest.fixture -def prop_table(table_factory): - table_factory('nominatim_properties', 'property TEXT, value TEXT') +def property_factory(property_table, temp_db_cursor): + """ A function fixture that adds a property into the property table. + """ + def _add_property(name, value): + temp_db_cursor.execute("INSERT INTO nominatim_properties VALUES(%s, %s)", + (name, value)) + return _add_property -def test_get_property_existing(prop_table, temp_db_conn, temp_db_cursor): - temp_db_cursor.execute("INSERT INTO nominatim_properties VALUES('foo', 'bar')") + +def test_get_property_existing(property_factory, temp_db_conn): + property_factory('foo', 'bar') assert properties.get_property(temp_db_conn, 'foo') == 'bar' -def test_get_property_unknown(prop_table, temp_db_conn, temp_db_cursor): - temp_db_cursor.execute("INSERT INTO nominatim_properties VALUES('other', 'bar')") +def test_get_property_unknown(property_factory, temp_db_conn): + property_factory('other', 'bar') assert properties.get_property(temp_db_conn, 'foo') is None @pytest.mark.parametrize("prefill", (True, False)) -def test_set_property_new(prop_table, temp_db_conn, temp_db_cursor, prefill): +def test_set_property_new(property_factory, temp_db_conn, temp_db_cursor, prefill): if prefill: - temp_db_cursor.execute("INSERT INTO nominatim_properties VALUES('something', 'bar')") + property_factory('something', 'bar') properties.set_property(temp_db_conn, 'something', 'else')