X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8bf15fa691e286c27c05619ae102fb4db16eda0d..345c812e4357087e1568f44e6e9d451e5ee6729a:/test/python/test_cli.py diff --git a/test/python/test_cli.py b/test/python/test_cli.py index 1d775b1f..7bc3fc09 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -15,8 +15,10 @@ 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 @@ -60,7 +62,6 @@ class TestCli: @pytest.mark.parametrize("command,script", [ - (('add-data', '--file', 'foo.osm'), 'update'), (('export',), 'export') ]) def test_legacy_commands_simple(self, mock_run_legacy, command, script): @@ -88,13 +89,20 @@ class TestCli: assert mock.called == 1 - @pytest.mark.parametrize("name,oid", [('file', 'foo.osm'), ('diff', 'foo.osc'), - ('node', 12), ('way', 8), ('relation', 32)]) - def test_add_data_command(self, mock_run_legacy, name, oid): + @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 + + assert mock_run_legacy.called == 1 + + + @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 assert mock_run_legacy.called == 1 - assert mock_run_legacy.last_args == ('update.php', '--import-' + name, oid) def test_serve_command(self, mock_func_factory): @@ -105,23 +113,36 @@ class TestCli: assert func.called == 1 - @pytest.mark.parametrize("params", [('search', '--query', 'new'), - ('reverse', '--lat', '0', '--lon', '0'), - ('lookup', '--id', 'N1'), - ('details', '--node', '1'), - ('details', '--way', '1'), - ('details', '--relation', '1'), - ('details', '--place_id', '10001'), - ('status',)]) - def test_api_commands_simple(self, mock_func_factory, params): +@pytest.mark.parametrize("params", [('search', '--query', 'new'), + ('reverse', '--lat', '0', '--lon', '0'), + ('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) == 0 + 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: @@ -136,6 +157,7 @@ class TestCliWithDb: 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 @@ -143,6 +165,10 @@ class TestCliWithDb: 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) @@ -163,6 +189,7 @@ class TestCliWithDb: 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'), @@ -171,8 +198,8 @@ class TestCliWithDb: 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.database_import, 'create_country_names'), - mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_file'), + 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'), @@ -195,7 +222,7 @@ class TestCliWithDb: 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.database_import, 'create_country_names'), + 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'), @@ -213,7 +240,7 @@ class TestCliWithDb: temp_db_conn): mocks = [ mock_func_factory(nominatim.tools.database_import, 'create_search_indices'), - mock_func_factory(nominatim.tools.database_import, 'create_country_names'), + 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') @@ -234,7 +261,7 @@ class TestCliWithDb: 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.database_import, 'create_country_names'), + 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') ] @@ -307,8 +334,7 @@ class TestCliWithDb: assert func.called == 1 @pytest.mark.parametrize("command,func", [ - ('word-counts', 'recompute_word_counts'), - ('address-levels', 'load_address_levels_from_file'), + ('address-levels', 'load_address_levels_from_config'), ('wiki-data', 'import_wikipedia_articles'), ('importance', 'recompute_importance'), ('website', 'setup_website'), @@ -320,7 +346,12 @@ class TestCliWithDb: assert func_mock.called == 1 - def test_refresh_postcodes(self, mock_func_factory): + 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')