hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-15 19:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: replace raw execute() with fixture code where possible

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-05-19 12:11:04 +02:00
parent 65bd749918
commit c06a1d007a
15 changed files with 128 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/python/test_db_properties.py
View File

@@ -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')