safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests 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

31
test/python/test_tools_admin.py
View File

@@ -3,39 +3,40 @@ Tests for maintenance and analysis functions.
"""
import pytest
from nominatim.db.connection import connect
from nominatim.errors import UsageError
from nominatim.tools import admin
@pytest.fixture
def db(temp_db, placex_table):
with connect('dbname=' + temp_db) as conn:
yield conn
@pytest.fixture(autouse=True)
def create_placex_table(placex_table):
""" All tests in this module require the placex table to be set up.
"""
pass
def test_analyse_indexing_no_objects(db):
def test_analyse_indexing_no_objects(temp_db_conn):
with pytest.raises(UsageError):
admin.analyse_indexing(db)
admin.analyse_indexing(temp_db_conn)
@pytest.mark.parametrize("oid", ['1234', 'N123a', 'X123'])
def test_analyse_indexing_bad_osmid(db, oid):
def test_analyse_indexing_bad_osmid(temp_db_conn, oid):
with pytest.raises(UsageError):
admin.analyse_indexing(db, osm_id=oid)
admin.analyse_indexing(temp_db_conn, osm_id=oid)
def test_analyse_indexing_unknown_osmid(db):
def test_analyse_indexing_unknown_osmid(temp_db_conn):
with pytest.raises(UsageError):
admin.analyse_indexing(db, osm_id='W12345674')
admin.analyse_indexing(temp_db_conn, osm_id='W12345674')
def test_analyse_indexing_with_place_id(db, temp_db_cursor):
def test_analyse_indexing_with_place_id(temp_db_conn, temp_db_cursor):
temp_db_cursor.execute("INSERT INTO placex (place_id) VALUES(12345)")
admin.analyse_indexing(db, place_id=12345)
admin.analyse_indexing(temp_db_conn, place_id=12345)
def test_analyse_indexing_with_osm_id(db, temp_db_cursor):
def test_analyse_indexing_with_osm_id(temp_db_conn, temp_db_cursor):
temp_db_cursor.execute("""INSERT INTO placex (place_id, osm_type, osm_id)
VALUES(9988, 'N', 10000)""")
admin.analyse_indexing(db, osm_id='N10000')
admin.analyse_indexing(temp_db_conn, osm_id='N10000')