mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-02-14 18:37:58 +00:00
split cli tests by subcommand and extend coverage
This commit is contained in:
Sarah Hoffmann
@@ -154,15 +154,13 @@ class APIReverse:
|
||||
|
||||
@staticmethod
|
||||
def run(args):
|
||||
params = dict(lat=args.lat, lon=args.lon)
|
||||
params = dict(lat=args.lat, lon=args.lon, format=args.format)
|
||||
if args.zoom is not None:
|
||||
params['zoom'] = args.zoom
|
||||
|
||||
for param, _ in EXTRADATA_PARAMS:
|
||||
if getattr(args, param):
|
||||
params[param] = '1'
|
||||
if args.format:
|
||||
params['format'] = args.format
|
||||
if args.lang:
|
||||
params['accept-language'] = args.lang
|
||||
if args.polygon_output:
|
||||
@@ -195,13 +193,11 @@ class APILookup:
|
||||
|
||||
@staticmethod
|
||||
def run(args):
|
||||
params = dict(osm_ids=','.join(args.ids))
|
||||
params = dict(osm_ids=','.join(args.ids), format=args.format)
|
||||
|
||||
for param, _ in EXTRADATA_PARAMS:
|
||||
if getattr(args, param):
|
||||
params[param] = '1'
|
||||
if args.format:
|
||||
params['format'] = args.format
|
||||
if args.lang:
|
||||
params['accept-language'] = args.lang
|
||||
if args.polygon_output:
|
||||
@@ -258,6 +254,8 @@ class APIDetails:
|
||||
params['class'] = args.object_class
|
||||
for name, _ in DETAILS_SWITCHES:
|
||||
params[name] = '1' if getattr(args, name) else '0'
|
||||
if args.lang:
|
||||
params['accept-language'] = args.lang
|
||||
|
||||
return _run_api('details', args, params)
|
||||
|
||||
|
||||
@@ -19,6 +19,21 @@ class MockParamCapture:
|
||||
return self.return_value
|
||||
|
||||
|
||||
class DummyTokenizer:
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.update_sql_functions_called = False
|
||||
self.finalize_import_called = False
|
||||
self.update_statistics_called = False
|
||||
|
||||
def update_sql_functions(self, *args):
|
||||
self.update_sql_functions_called = True
|
||||
|
||||
def finalize_import(self, *args):
|
||||
self.finalize_import_called = True
|
||||
|
||||
def update_statistics(self):
|
||||
self.update_statistics_called = True
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def cli_call(src_dir):
|
||||
@@ -54,3 +69,14 @@ def mock_func_factory(monkeypatch):
|
||||
return mock
|
||||
|
||||
return get_mock
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def cli_tokenizer_mock(monkeypatch):
|
||||
tok = DummyTokenizer()
|
||||
monkeypatch.setattr(nominatim.tokenizer.factory, 'get_tokenizer_for_db',
|
||||
lambda *args: tok)
|
||||
monkeypatch.setattr(nominatim.tokenizer.factory, 'create_tokenizer',
|
||||
lambda *args: tok)
|
||||
|
||||
return tok
|
||||
|
||||
@@ -7,254 +7,91 @@ the actual functions.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
import nominatim.db.properties
|
||||
import nominatim.cli
|
||||
import nominatim.clicmd.api
|
||||
import nominatim.clicmd.refresh
|
||||
import nominatim.clicmd.admin
|
||||
import nominatim.clicmd.setup
|
||||
import nominatim.indexer.indexer
|
||||
import nominatim.tools.admin
|
||||
import nominatim.tools.add_osm_data
|
||||
import nominatim.tools.check_database
|
||||
import nominatim.tools.database_import
|
||||
import nominatim.tools.country_info
|
||||
import nominatim.tools.freeze
|
||||
import nominatim.tools.refresh
|
||||
import nominatim.tools.postcodes
|
||||
import nominatim.tokenizer.factory
|
||||
|
||||
|
||||
class TestCli:
|
||||
def test_cli_help(cli_call, capsys):
|
||||
""" Running nominatim tool without arguments prints help.
|
||||
"""
|
||||
assert cli_call() == 1
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call):
|
||||
self.call_nominatim = cli_call
|
||||
captured = capsys.readouterr()
|
||||
assert captured.out.startswith('usage:')
|
||||
|
||||
|
||||
def test_cli_help(self, capsys):
|
||||
""" Running nominatim tool without arguments prints help.
|
||||
"""
|
||||
assert self.call_nominatim() == 1
|
||||
@pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')])
|
||||
def test_cli_add_data_file_command(cli_call, mock_func_factory, name, oid):
|
||||
mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_data_from_file')
|
||||
assert cli_call('add-data', '--' + name, str(oid)) == 0
|
||||
|
||||
captured = capsys.readouterr()
|
||||
assert captured.out.startswith('usage:')
|
||||
assert mock_run_legacy.called == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("command,script", [
|
||||
(('export',), 'export')
|
||||
])
|
||||
def test_legacy_commands_simple(self, mock_run_legacy, command, script):
|
||||
assert self.call_nominatim(*command) == 0
|
||||
@pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)])
|
||||
def test_cli_add_data_object_command(cli_call, mock_func_factory, name, oid):
|
||||
mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_osm_object')
|
||||
assert cli_call('add-data', '--' + name, str(oid)) == 0
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
assert mock_run_legacy.last_args[0] == script + '.php'
|
||||
assert mock_run_legacy.called == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params", [('--warm', ),
|
||||
('--warm', '--reverse-only'),
|
||||
('--warm', '--search-only')])
|
||||
def test_admin_command_legacy(self, mock_func_factory, params):
|
||||
mock_run_legacy = mock_func_factory(nominatim.clicmd.admin, 'run_legacy_script')
|
||||
|
||||
assert self.call_nominatim('admin', *params) == 0
|
||||
def test_cli_add_data_tiger_data(cli_call, cli_tokenizer_mock, mock_func_factory):
|
||||
mock = mock_func_factory(nominatim.tools.tiger_data, 'add_tiger_data')
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
assert cli_call('add-data', '--tiger-data', 'somewhere') == 0
|
||||
|
||||
assert mock.called == 1
|
||||
|
||||
|
||||
def test_admin_command_check_database(self, mock_func_factory):
|
||||
mock = mock_func_factory(nominatim.tools.check_database, 'check_database')
|
||||
def test_cli_serve_command(cli_call, mock_func_factory):
|
||||
func = mock_func_factory(nominatim.cli, 'run_php_server')
|
||||
|
||||
assert self.call_nominatim('admin', '--check-database') == 0
|
||||
assert mock.called == 1
|
||||
cli_call('serve') == 0
|
||||
|
||||
assert func.called == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc')])
|
||||
def test_add_data_file_command(self, mock_func_factory, name, oid):
|
||||
mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_data_from_file')
|
||||
assert self.call_nominatim('add-data', '--' + name, str(oid)) == 0
|
||||
def test_cli_export_command(cli_call, mock_run_legacy):
|
||||
assert cli_call('export', '--output-all-postcodes') == 0
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
assert mock_run_legacy.called == 1
|
||||
assert mock_run_legacy.last_args[0] == 'export.php'
|
||||
|
||||
|
||||
@pytest.mark.parametrize("name,oid", [('node', 12), ('way', 8), ('relation', 32)])
|
||||
def test_add_data_object_command(self, mock_func_factory, name, oid):
|
||||
mock_run_legacy = mock_func_factory(nominatim.tools.add_osm_data, 'add_osm_object')
|
||||
assert self.call_nominatim('add-data', '--' + name, str(oid)) == 0
|
||||
@pytest.mark.parametrize("param,value", [('output-type', 'country'),
|
||||
('output-format', 'street;city'),
|
||||
('language', 'xf'),
|
||||
('restrict-to-country', 'us'),
|
||||
('restrict-to-osm-node', '536'),
|
||||
('restrict-to-osm-way', '727'),
|
||||
('restrict-to-osm-relation', '197532')
|
||||
])
|
||||
def test_export_parameters(src_dir, tmp_path, param, value):
|
||||
(tmp_path / 'admin').mkdir()
|
||||
(tmp_path / 'admin' / 'export.php').write_text(f"""<?php
|
||||
exit(strpos(implode(' ', $_SERVER['argv']), '--{param} {value}') >= 0 ? 0 : 10);
|
||||
""")
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
|
||||
osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
|
||||
phplib_dir=str(tmp_path),
|
||||
data_dir=str(src_dir / 'data'),
|
||||
phpcgi_path='/usr/bin/php-cgi',
|
||||
sqllib_dir=str(src_dir / 'lib-sql'),
|
||||
config_dir=str(src_dir / 'settings'),
|
||||
cli_args=['export', '--' + param, value]) == 0
|
||||
|
||||
|
||||
def test_serve_command(self, mock_func_factory):
|
||||
func = mock_func_factory(nominatim.cli, 'run_php_server')
|
||||
|
||||
self.call_nominatim('serve')
|
||||
|
||||
assert func.called == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params", [('search', '--query', 'new', '--polygon-output', 'svg', '--polygon-threshold', '0.1'),
|
||||
('search', '--city', 'Berlin', '--format', 'xml', '--lang', 'de'),
|
||||
('reverse', '--lat', '0', '--lon', '0',
|
||||
'--polygon-output', 'svg', '--polygon-threshold', '0.1', '--format', 'json', '--lang', 'en'),
|
||||
('lookup', '--id', 'N1',
|
||||
'--polygon-output', 'svg', '--polygon-threshold', '0.1', '--format', 'json', '--lang', 'en'),
|
||||
('details', '--node', '1'),
|
||||
('details', '--way', '1'),
|
||||
('details', '--relation', '1'),
|
||||
('details', '--place_id', '10001'),
|
||||
('status',)])
|
||||
class TestCliApiCall:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call):
|
||||
self.call_nominatim = cli_call
|
||||
|
||||
def test_api_commands_simple(self, mock_func_factory, params, tmp_path):
|
||||
(tmp_path / 'website').mkdir()
|
||||
(tmp_path / 'website' / (params[0] + '.php')).write_text('')
|
||||
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
|
||||
|
||||
assert self.call_nominatim(*params, '--project-dir', str(tmp_path)) == 0
|
||||
|
||||
assert mock_run_api.called == 1
|
||||
assert mock_run_api.last_args[0] == params[0]
|
||||
|
||||
|
||||
def test_bad_project_idr(self, mock_func_factory, params):
|
||||
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
|
||||
|
||||
assert self.call_nominatim(*params) == 1
|
||||
|
||||
|
||||
class TestCliWithDb:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call, temp_db):
|
||||
def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock):
|
||||
self.call_nominatim = cli_call
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_tokenizer_mock(self, monkeypatch):
|
||||
class DummyTokenizer:
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.update_sql_functions_called = False
|
||||
self.finalize_import_called = False
|
||||
self.update_statistics_called = False
|
||||
|
||||
def update_sql_functions(self, *args):
|
||||
self.update_sql_functions_called = True
|
||||
|
||||
def finalize_import(self, *args):
|
||||
self.finalize_import_called = True
|
||||
|
||||
def update_statistics(self):
|
||||
self.update_statistics_called = True
|
||||
|
||||
|
||||
tok = DummyTokenizer()
|
||||
monkeypatch.setattr(nominatim.tokenizer.factory, 'get_tokenizer_for_db',
|
||||
lambda *args: tok)
|
||||
monkeypatch.setattr(nominatim.tokenizer.factory, 'create_tokenizer',
|
||||
lambda *args: tok)
|
||||
|
||||
self.tokenizer_mock = tok
|
||||
|
||||
|
||||
def test_import_missing_file(self):
|
||||
assert self.call_nominatim('import', '--osm-file', 'sfsafegwedgw.reh.erh') == 1
|
||||
|
||||
|
||||
def test_import_bad_file(self):
|
||||
assert self.call_nominatim('import', '--osm-file', '.') == 1
|
||||
|
||||
|
||||
def test_import_full(self, mock_func_factory):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'setup_database_skeleton'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'setup_country_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'import_osm_data'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'import_wikipedia_articles'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'load_data'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_table_triggers'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_partition_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_config'),
|
||||
mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
cf_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
|
||||
|
||||
assert self.call_nominatim('import', '--osm-file', __file__) == 0
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
assert cf_mock.called > 1
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
|
||||
def test_import_continue_load_data(self, mock_func_factory):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'load_data'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'load-data') == 0
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
|
||||
def test_import_continue_indexing(self, mock_func_factory, placex_table,
|
||||
temp_db_conn):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'indexing') == 0
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
assert temp_db_conn.index_exists('idx_placex_pendingsector')
|
||||
|
||||
# Calling it again still works for the index
|
||||
assert self.call_nominatim('import', '--continue', 'indexing') == 0
|
||||
assert temp_db_conn.index_exists('idx_placex_pendingsector')
|
||||
|
||||
|
||||
def test_import_continue_postprocess(self, mock_func_factory):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'db-postprocess') == 0
|
||||
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
self.tokenizer_mock = cli_tokenizer_mock
|
||||
|
||||
|
||||
def test_freeze_command(self, mock_func_factory):
|
||||
@@ -267,15 +104,6 @@ class TestCliWithDb:
|
||||
assert mock_flatnode.called == 1
|
||||
|
||||
|
||||
|
||||
@pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))])
|
||||
def test_admin_command_tool(self, mock_func_factory, func, params):
|
||||
mock = mock_func_factory(nominatim.tools.admin, func)
|
||||
|
||||
assert self.call_nominatim('admin', *params) == 0
|
||||
assert mock.called == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params,do_bnds,do_ranks", [
|
||||
([], 1, 1),
|
||||
(['--boundaries-only'], 1, 0),
|
||||
@@ -292,71 +120,27 @@ class TestCliWithDb:
|
||||
assert bnd_mock.called == do_bnds
|
||||
assert rank_mock.called == do_ranks
|
||||
|
||||
@pytest.mark.parametrize("no_replace", [(True), (False)])
|
||||
def test_special_phrases_wiki_command(self, mock_func_factory, no_replace):
|
||||
|
||||
def test_special_phrases_wiki_command(self, mock_func_factory):
|
||||
func = mock_func_factory(nominatim.clicmd.special_phrases.SPImporter, 'import_phrases')
|
||||
|
||||
if no_replace:
|
||||
self.call_nominatim('special-phrases', '--import-from-wiki', '--no-replace')
|
||||
else:
|
||||
self.call_nominatim('special-phrases', '--import-from-wiki')
|
||||
self.call_nominatim('special-phrases', '--import-from-wiki', '--no-replace')
|
||||
|
||||
assert func.called == 1
|
||||
|
||||
@pytest.mark.parametrize("no_replace", [(True), (False)])
|
||||
def test_special_phrases_csv_command(self, src_dir, mock_func_factory, no_replace):
|
||||
|
||||
def test_special_phrases_csv_command(self, src_dir, mock_func_factory):
|
||||
func = mock_func_factory(nominatim.clicmd.special_phrases.SPImporter, 'import_phrases')
|
||||
testdata = src_dir / 'test' / 'testdb'
|
||||
csv_path = str((testdata / 'full_en_phrases_test.csv').resolve())
|
||||
|
||||
if no_replace:
|
||||
self.call_nominatim('special-phrases', '--import-from-csv', csv_path, '--no-replace')
|
||||
else:
|
||||
self.call_nominatim('special-phrases', '--import-from-csv', csv_path)
|
||||
self.call_nominatim('special-phrases', '--import-from-csv', csv_path)
|
||||
|
||||
assert func.called == 1
|
||||
|
||||
@pytest.mark.parametrize("command,func", [
|
||||
('address-levels', 'load_address_levels_from_config'),
|
||||
('wiki-data', 'import_wikipedia_articles'),
|
||||
('importance', 'recompute_importance'),
|
||||
('website', 'setup_website'),
|
||||
])
|
||||
def test_refresh_command(self, mock_func_factory, command, func):
|
||||
func_mock = mock_func_factory(nominatim.tools.refresh, func)
|
||||
|
||||
assert self.call_nominatim('refresh', '--' + command) == 0
|
||||
assert func_mock.called == 1
|
||||
def test_special_phrases_csv_bad_file(self, src_dir):
|
||||
testdata = src_dir / 'something349053905.csv'
|
||||
|
||||
|
||||
def test_refresh_word_count(self):
|
||||
assert self.call_nominatim('refresh', '--word-count') == 0
|
||||
assert self.tokenizer_mock.update_statistics_called
|
||||
|
||||
|
||||
def test_refresh_postcodes(self, mock_func_factory, place_table):
|
||||
func_mock = mock_func_factory(nominatim.tools.postcodes, 'update_postcodes')
|
||||
idx_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_postcodes')
|
||||
|
||||
assert self.call_nominatim('refresh', '--postcodes') == 0
|
||||
assert func_mock.called == 1
|
||||
assert idx_mock.called == 1
|
||||
|
||||
def test_refresh_create_functions(self, mock_func_factory):
|
||||
func_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
|
||||
|
||||
assert self.call_nominatim('refresh', '--functions') == 0
|
||||
assert func_mock.called == 1
|
||||
assert self.tokenizer_mock.update_sql_functions_called
|
||||
|
||||
|
||||
def test_refresh_importance_computed_after_wiki_import(self, monkeypatch):
|
||||
calls = []
|
||||
monkeypatch.setattr(nominatim.tools.refresh, 'import_wikipedia_articles',
|
||||
lambda *args, **kwargs: calls.append('import') or 0)
|
||||
monkeypatch.setattr(nominatim.tools.refresh, 'recompute_importance',
|
||||
lambda *args, **kwargs: calls.append('update'))
|
||||
|
||||
assert self.call_nominatim('refresh', '--importance', '--wiki-data') == 0
|
||||
|
||||
assert calls == ['import', 'update']
|
||||
self.call_nominatim('special-phrases', '--import-from-csv',
|
||||
str(testdata.resolve())) == 1
|
||||
|
||||
54
test/python/cli/test_cmd_admin.py
Normal file
54
test/python/cli/test_cmd_admin.py
Normal file
@@ -0,0 +1,54 @@
|
||||
"""
|
||||
Test for the command line interface wrapper admin subcommand.
|
||||
|
||||
These tests just check that the various command line parameters route to the
|
||||
correct functionionality. They use a lot of monkeypatching to avoid executing
|
||||
the actual functions.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
import nominatim.tools.admin
|
||||
import nominatim.tools.check_database
|
||||
import nominatim.tools.migration
|
||||
import nominatim.clicmd.admin
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params", [('--warm', ),
|
||||
('--warm', '--reverse-only'),
|
||||
('--warm', '--search-only')])
|
||||
def test_admin_command_legacy(cli_call, mock_func_factory, params):
|
||||
mock_run_legacy = mock_func_factory(nominatim.clicmd.admin, 'run_legacy_script')
|
||||
|
||||
assert cli_call('admin', *params) == 0
|
||||
|
||||
assert mock_run_legacy.called == 1
|
||||
|
||||
|
||||
def test_admin_command_check_database(cli_call, mock_func_factory):
|
||||
mock = mock_func_factory(nominatim.tools.check_database, 'check_database')
|
||||
|
||||
assert cli_call('admin', '--check-database') == 0
|
||||
assert mock.called == 1
|
||||
|
||||
|
||||
def test_admin_migrate(cli_call, mock_func_factory):
|
||||
mock = mock_func_factory(nominatim.tools.migration, 'migrate')
|
||||
|
||||
assert cli_call('admin', '--migrate') == 0
|
||||
assert mock.called == 1
|
||||
|
||||
|
||||
class TestCliAdminWithDb:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock):
|
||||
self.call_nominatim = cli_call
|
||||
self.tokenizer_mock = cli_tokenizer_mock
|
||||
|
||||
|
||||
@pytest.mark.parametrize("func, params", [('analyse_indexing', ('--analyse-indexing', ))])
|
||||
def test_analyse_indexing(self, mock_func_factory, func, params):
|
||||
mock = mock_func_factory(nominatim.tools.admin, func)
|
||||
|
||||
assert self.call_nominatim('admin', *params) == 0
|
||||
assert mock.called == 1
|
||||
154
test/python/cli/test_cmd_api.py
Normal file
154
test/python/cli/test_cmd_api.py
Normal file
@@ -0,0 +1,154 @@
|
||||
"""
|
||||
Tests for API access commands of command-line interface wrapper.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
import nominatim.clicmd.api
|
||||
|
||||
|
||||
@pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup', 'details', 'status')))
|
||||
def test_no_api_without_phpcgi(src_dir, endpoint):
|
||||
with pytest.raises(SystemExit):
|
||||
nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE',
|
||||
osm2pgsql_path='OSM2PGSQL NOT AVAILABLE',
|
||||
phplib_dir=str(src_dir / 'lib-php'),
|
||||
data_dir=str(src_dir / 'data'),
|
||||
phpcgi_path=None,
|
||||
sqllib_dir=str(src_dir / 'lib-sql'),
|
||||
config_dir=str(src_dir / 'settings'),
|
||||
cli_args=[endpoint])
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params", [('search', '--query', 'new'),
|
||||
('search', '--city', 'Berlin'),
|
||||
('reverse', '--lat', '0', '--lon', '0', '--zoom', '13'),
|
||||
('lookup', '--id', 'N1'),
|
||||
('details', '--node', '1'),
|
||||
('details', '--way', '1'),
|
||||
('details', '--relation', '1'),
|
||||
('details', '--place_id', '10001'),
|
||||
('status',)])
|
||||
class TestCliApiCall:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call):
|
||||
self.call_nominatim = cli_call
|
||||
|
||||
def test_api_commands_simple(self, mock_func_factory, params, tmp_path):
|
||||
(tmp_path / 'website').mkdir()
|
||||
(tmp_path / 'website' / (params[0] + '.php')).write_text('')
|
||||
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
|
||||
|
||||
assert self.call_nominatim(*params, '--project-dir', str(tmp_path)) == 0
|
||||
|
||||
assert mock_run_api.called == 1
|
||||
assert mock_run_api.last_args[0] == params[0]
|
||||
|
||||
|
||||
def test_bad_project_idr(self, mock_func_factory, params):
|
||||
mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script')
|
||||
|
||||
assert self.call_nominatim(*params) == 1
|
||||
|
||||
QUERY_PARAMS = {
|
||||
'search': ('--query', 'somewhere'),
|
||||
'reverse': ('--lat', '20', '--lon', '30'),
|
||||
'lookup': ('--id', 'R345345'),
|
||||
'details': ('--node', '324')
|
||||
}
|
||||
|
||||
@pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup')))
|
||||
class TestCliApiCommonParameters:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_website_dir(self, cli_call, project_env, endpoint):
|
||||
self.endpoint = endpoint
|
||||
self.cli_call = cli_call
|
||||
self.project_dir = project_env.project_dir
|
||||
(self.project_dir / 'website').mkdir()
|
||||
|
||||
|
||||
def expect_param(self, param, expected):
|
||||
(self.project_dir / 'website' / (self.endpoint + '.php')).write_text(f"""<?php
|
||||
exit($_GET['{param}'] == '{expected}' ? 0 : 10);
|
||||
""")
|
||||
|
||||
|
||||
def call_nominatim(self, *params):
|
||||
return self.cli_call(self.endpoint, *QUERY_PARAMS[self.endpoint],
|
||||
'--project-dir', str(self.project_dir), *params)
|
||||
|
||||
|
||||
def test_param_output(self):
|
||||
self.expect_param('format', 'xml')
|
||||
assert self.call_nominatim('--format', 'xml') == 0
|
||||
|
||||
|
||||
def test_param_lang(self):
|
||||
self.expect_param('accept-language', 'de')
|
||||
assert self.call_nominatim('--lang', 'de') == 0
|
||||
assert self.call_nominatim('--accept-language', 'de') == 0
|
||||
|
||||
|
||||
@pytest.mark.parametrize("param", ('addressdetails', 'extratags', 'namedetails'))
|
||||
def test_param_extradata(self, param):
|
||||
self.expect_param(param, '1')
|
||||
|
||||
assert self.call_nominatim('--' + param) == 0
|
||||
|
||||
def test_param_polygon_output(self):
|
||||
self.expect_param('polygon_geojson', '1')
|
||||
|
||||
assert self.call_nominatim('--polygon-output', 'geojson') == 0
|
||||
|
||||
|
||||
def test_param_polygon_threshold(self):
|
||||
self.expect_param('polygon_threshold', '0.3452')
|
||||
|
||||
assert self.call_nominatim('--polygon-threshold', '0.3452') == 0
|
||||
|
||||
|
||||
def test_cli_search_param_bounded(cli_call, project_env):
|
||||
webdir = project_env.project_dir / 'website'
|
||||
webdir.mkdir()
|
||||
(webdir / 'search.php').write_text(f"""<?php
|
||||
exit($_GET['bounded'] == '1' ? 0 : 10);
|
||||
""")
|
||||
|
||||
assert cli_call('search', *QUERY_PARAMS['search'], '--project-dir', str(project_env.project_dir),
|
||||
'--bounded') == 0
|
||||
|
||||
|
||||
def test_cli_search_param_dedupe(cli_call, project_env):
|
||||
webdir = project_env.project_dir / 'website'
|
||||
webdir.mkdir()
|
||||
(webdir / 'search.php').write_text(f"""<?php
|
||||
exit($_GET['dedupe'] == '0' ? 0 : 10);
|
||||
""")
|
||||
|
||||
assert cli_call('search', *QUERY_PARAMS['search'], '--project-dir', str(project_env.project_dir),
|
||||
'--no-dedupe') == 0
|
||||
|
||||
|
||||
def test_cli_details_param_class(cli_call, project_env):
|
||||
webdir = project_env.project_dir / 'website'
|
||||
webdir.mkdir()
|
||||
(webdir / 'details.php').write_text(f"""<?php
|
||||
exit($_GET['class'] == 'highway' ? 0 : 10);
|
||||
""")
|
||||
|
||||
assert cli_call('details', *QUERY_PARAMS['details'], '--project-dir', str(project_env.project_dir),
|
||||
'--class', 'highway') == 0
|
||||
|
||||
|
||||
@pytest.mark.parametrize('param', ('lang', 'accept-language'))
|
||||
def test_cli_details_param_lang(cli_call, project_env, param):
|
||||
webdir = project_env.project_dir / 'website'
|
||||
webdir.mkdir()
|
||||
(webdir / 'details.php').write_text(f"""<?php
|
||||
exit($_GET['accept-language'] == 'es' ? 0 : 10);
|
||||
""")
|
||||
|
||||
assert cli_call('details', *QUERY_PARAMS['details'], '--project-dir', str(project_env.project_dir),
|
||||
'--' + param, 'es') == 0
|
||||
|
||||
122
test/python/cli/test_cmd_import.py
Normal file
122
test/python/cli/test_cmd_import.py
Normal file
@@ -0,0 +1,122 @@
|
||||
"""
|
||||
Tests for import command of the command-line interface wrapper.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
import nominatim.tools.database_import
|
||||
import nominatim.tools.country_info
|
||||
import nominatim.tools.refresh
|
||||
import nominatim.tools.postcodes
|
||||
import nominatim.indexer.indexer
|
||||
import nominatim.db.properties
|
||||
|
||||
|
||||
class TestCliImportWithDb:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock):
|
||||
self.call_nominatim = cli_call
|
||||
self.tokenizer_mock = cli_tokenizer_mock
|
||||
|
||||
|
||||
def test_import_missing_file(self):
|
||||
assert self.call_nominatim('import', '--osm-file', 'sfsafegwedgw.reh.erh') == 1
|
||||
|
||||
|
||||
def test_import_bad_file(self):
|
||||
assert self.call_nominatim('import', '--osm-file', '.') == 1
|
||||
|
||||
|
||||
@pytest.mark.parametrize('with_updates', [True, False])
|
||||
def test_import_full(self, mock_func_factory, with_updates, place_table, property_table):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'setup_database_skeleton'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'setup_country_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'import_osm_data'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'import_wikipedia_articles'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'load_data'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_table_triggers'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_partition_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_config'),
|
||||
mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
]
|
||||
|
||||
params = ['import', '--osm-file', __file__]
|
||||
|
||||
if with_updates:
|
||||
mocks.append(mock_func_factory(nominatim.tools.freeze, 'drop_update_tables'))
|
||||
params.append('--no-updates')
|
||||
|
||||
cf_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
|
||||
|
||||
|
||||
assert self.call_nominatim(*params) == 0
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
assert cf_mock.called > 1
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
|
||||
def test_import_continue_load_data(self, mock_func_factory):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'truncate_data_tables'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'load_data'),
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.postcodes, 'update_postcodes'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'load-data') == 0
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
|
||||
def test_import_continue_indexing(self, mock_func_factory, placex_table,
|
||||
temp_db_conn):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'indexing') == 0
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
|
||||
assert temp_db_conn.index_exists('idx_placex_pendingsector')
|
||||
|
||||
# Calling it again still works for the index
|
||||
assert self.call_nominatim('import', '--continue', 'indexing') == 0
|
||||
assert temp_db_conn.index_exists('idx_placex_pendingsector')
|
||||
|
||||
|
||||
def test_import_continue_postprocess(self, mock_func_factory):
|
||||
mocks = [
|
||||
mock_func_factory(nominatim.tools.database_import, 'create_search_indices'),
|
||||
mock_func_factory(nominatim.tools.country_info, 'create_country_names'),
|
||||
mock_func_factory(nominatim.tools.refresh, 'setup_website'),
|
||||
mock_func_factory(nominatim.db.properties, 'set_property')
|
||||
]
|
||||
|
||||
assert self.call_nominatim('import', '--continue', 'db-postprocess') == 0
|
||||
|
||||
assert self.tokenizer_mock.finalize_import_called
|
||||
|
||||
for mock in mocks:
|
||||
assert mock.called == 1, "Mock '{}' not called".format(mock.func_name)
|
||||
73
test/python/cli/test_cmd_refresh.py
Normal file
73
test/python/cli/test_cmd_refresh.py
Normal file
@@ -0,0 +1,73 @@
|
||||
"""
|
||||
Tests for command line interface wrapper for refresk command.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
import nominatim.tools.refresh
|
||||
import nominatim.tools.postcodes
|
||||
import nominatim.indexer.indexer
|
||||
|
||||
class TestRefresh:
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def setup_cli_call(self, cli_call, temp_db, cli_tokenizer_mock):
|
||||
self.call_nominatim = cli_call
|
||||
self.tokenizer_mock = cli_tokenizer_mock
|
||||
|
||||
|
||||
@pytest.mark.parametrize("command,func", [
|
||||
('address-levels', 'load_address_levels_from_config'),
|
||||
('wiki-data', 'import_wikipedia_articles'),
|
||||
('importance', 'recompute_importance'),
|
||||
('website', 'setup_website'),
|
||||
])
|
||||
def test_refresh_command(self, mock_func_factory, command, func):
|
||||
func_mock = mock_func_factory(nominatim.tools.refresh, func)
|
||||
|
||||
assert self.call_nominatim('refresh', '--' + command) == 0
|
||||
assert func_mock.called == 1
|
||||
|
||||
|
||||
def test_refresh_word_count(self):
|
||||
assert self.call_nominatim('refresh', '--word-count') == 0
|
||||
assert self.tokenizer_mock.update_statistics_called
|
||||
|
||||
|
||||
def test_refresh_postcodes(self, mock_func_factory, place_table):
|
||||
func_mock = mock_func_factory(nominatim.tools.postcodes, 'update_postcodes')
|
||||
idx_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_postcodes')
|
||||
|
||||
assert self.call_nominatim('refresh', '--postcodes') == 0
|
||||
assert func_mock.called == 1
|
||||
assert idx_mock.called == 1
|
||||
|
||||
|
||||
def test_refresh_postcodes_no_place_table(self):
|
||||
# Do nothing without the place table
|
||||
assert self.call_nominatim('refresh', '--postcodes') == 0
|
||||
|
||||
|
||||
def test_refresh_create_functions(self, mock_func_factory):
|
||||
func_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
|
||||
|
||||
assert self.call_nominatim('refresh', '--functions') == 0
|
||||
assert func_mock.called == 1
|
||||
assert self.tokenizer_mock.update_sql_functions_called
|
||||
|
||||
|
||||
def test_refresh_wikidata_file_not_found(self, monkeypatch):
|
||||
monkeypatch.setenv('NOMINATIM_WIKIPEDIA_DATA_PATH', 'gjoiergjeroi345Q')
|
||||
|
||||
assert self.call_nominatim('refresh', '--wiki-data') == 1
|
||||
|
||||
|
||||
def test_refresh_importance_computed_after_wiki_import(self, monkeypatch):
|
||||
calls = []
|
||||
monkeypatch.setattr(nominatim.tools.refresh, 'import_wikipedia_articles',
|
||||
lambda *args, **kwargs: calls.append('import') or 0)
|
||||
monkeypatch.setattr(nominatim.tools.refresh, 'recompute_importance',
|
||||
lambda *args, **kwargs: calls.append('update'))
|
||||
|
||||
assert self.call_nominatim('refresh', '--importance', '--wiki-data') == 0
|
||||
|
||||
assert calls == ['import', 'update']
|
||||
@@ -66,14 +66,20 @@ class TestCliReplication:
|
||||
|
||||
|
||||
@pytest.mark.parametrize("params,func", [
|
||||
(('--init',), 'init_replication'),
|
||||
(('--init', '--no-update-functions'), 'init_replication'),
|
||||
(('--check-for-updates',), 'check_for_updates')
|
||||
])
|
||||
def test_replication_command(self, mock_func_factory, params, func):
|
||||
func_mock = mock_func_factory(nominatim.tools.replication, func)
|
||||
|
||||
if params == ('--init',):
|
||||
umock = mock_func_factory(nominatim.tools.refresh, 'create_functions')
|
||||
|
||||
assert self.call_nominatim(*params) == 0
|
||||
assert func_mock.called == 1
|
||||
if params == ('--init',):
|
||||
assert umock.called == 1
|
||||
|
||||
|
||||
def test_replication_update_bad_interval(self, monkeypatch):
|
||||
@@ -89,6 +95,9 @@ class TestCliReplication:
|
||||
assert self.call_nominatim() == 1
|
||||
|
||||
|
||||
def test_replication_update_continuous_no_index(self):
|
||||
assert self.call_nominatim('--no-index') == 1
|
||||
|
||||
def test_replication_update_once_no_index(self, update_mock):
|
||||
assert self.call_nominatim('--once', '--no-index') == 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user