X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/296a66558ffb2ee2c43e653b00ff24097ee3525c..a33f2c0f5ba43df533b6e137f9151fe67feb20a1:/test/python/test_cli.py?ds=sidebyside diff --git a/test/python/test_cli.py b/test/python/test_cli.py index 10a31542..1d89ec69 100644 --- a/test/python/test_cli.py +++ b/test/python/test_cli.py @@ -57,6 +57,28 @@ def mock_func_factory(monkeypatch): return get_mock +@pytest.fixture +def tokenizer_mock(monkeypatch): + class DummyTokenizer: + def __init__(self, *args, **kwargs): + self.update_sql_functions_called = False + self.finalize_import_called = False + + def update_sql_functions(self, *args): + self.update_sql_functions_called = True + + def finalize_import(self, *args): + self.finalize_import_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) + + return tok + + def test_cli_help(capsys): """ Running nominatim tool without arguments prints help. """ @@ -85,7 +107,7 @@ def test_import_bad_file(temp_db): assert 1 == call_nominatim('import', '--osm-file', '.') -def test_import_full(temp_db, mock_func_factory): +def test_import_full(temp_db, mock_func_factory, tokenizer_mock): mocks = [ mock_func_factory(nominatim.tools.database_import, 'setup_database_skeleton'), mock_func_factory(nominatim.tools.database_import, 'import_osm_data'), @@ -97,7 +119,6 @@ def test_import_full(temp_db, mock_func_factory): 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.tokenizer.factory, 'create_tokenizer'), mock_func_factory(nominatim.tools.refresh, 'load_address_levels_from_file'), mock_func_factory(nominatim.tools.postcodes, 'import_postcodes'), mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'), @@ -108,6 +129,7 @@ def test_import_full(temp_db, mock_func_factory): cf_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions') assert 0 == call_nominatim('import', '--osm-file', __file__) + assert tokenizer_mock.finalize_import_called assert cf_mock.called > 1 @@ -115,13 +137,12 @@ def test_import_full(temp_db, mock_func_factory): assert mock.called == 1, "Mock '{}' not called".format(mock.func_name) -def test_import_continue_load_data(temp_db, mock_func_factory): +def test_import_continue_load_data(temp_db, mock_func_factory, tokenizer_mock): 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.database_import, 'create_country_names'), - mock_func_factory(nominatim.tokenizer.factory, 'create_tokenizer'), mock_func_factory(nominatim.tools.postcodes, 'import_postcodes'), mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'), mock_func_factory(nominatim.tools.refresh, 'setup_website'), @@ -129,17 +150,18 @@ def test_import_continue_load_data(temp_db, mock_func_factory): ] assert 0 == call_nominatim('import', '--continue', 'load-data') + assert 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(temp_db, mock_func_factory, placex_table, temp_db_conn): +def test_import_continue_indexing(temp_db, mock_func_factory, placex_table, + temp_db_conn, tokenizer_mock): 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.indexer.indexer.Indexer, 'index_full'), - mock_func_factory(nominatim.tokenizer.factory, 'create_tokenizer'), mock_func_factory(nominatim.tools.refresh, 'setup_website'), mock_func_factory(nominatim.db.properties, 'set_property') ] @@ -156,17 +178,18 @@ def test_import_continue_indexing(temp_db, mock_func_factory, placex_table, temp assert temp_db_conn.index_exists('idx_placex_pendingsector') -def test_import_continue_postprocess(temp_db, mock_func_factory): +def test_import_continue_postprocess(temp_db, mock_func_factory, tokenizer_mock): 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.refresh, 'setup_website'), - mock_func_factory(nominatim.tokenizer.factory, 'create_tokenizer'), mock_func_factory(nominatim.db.properties, 'set_property') ] assert 0 == call_nominatim('import', '--continue', 'db-postprocess') + assert tokenizer_mock.finalize_import_called + for mock in mocks: assert mock.called == 1, "Mock '{}' not called".format(mock.func_name) @@ -221,7 +244,8 @@ def test_add_data_command(mock_run_legacy, name, oid): (['--boundaries-only'], 1, 0), (['--no-boundaries'], 0, 1), (['--boundaries-only', '--no-boundaries'], 0, 0)]) -def test_index_command(mock_func_factory, temp_db_cursor, params, do_bnds, do_ranks): +def test_index_command(mock_func_factory, temp_db_cursor, tokenizer_mock, + params, do_bnds, do_ranks): temp_db_cursor.execute("CREATE TABLE import_status (indexed bool)") bnd_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_boundaries') rank_mock = mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_by_rank') @@ -231,10 +255,27 @@ def test_index_command(mock_func_factory, temp_db_cursor, params, do_bnds, do_ra assert bnd_mock.called == do_bnds assert rank_mock.called == do_ranks -def test_special_phrases_command(temp_db, mock_func_factory): - func = mock_func_factory(nominatim.clicmd.special_phrases.SpecialPhrasesImporter, 'import_from_wiki') +@pytest.mark.parametrize("no_replace", [(True), (False)]) +def test_special_phrases_wiki_command(temp_db, mock_func_factory, tokenizer_mock, no_replace): + func = mock_func_factory(nominatim.clicmd.special_phrases.SPImporter, 'import_phrases') - call_nominatim('special-phrases', '--import-from-wiki') + if no_replace: + call_nominatim('special-phrases', '--import-from-wiki', '--no-replace') + else: + call_nominatim('special-phrases', '--import-from-wiki') + + assert func.called == 1 + +@pytest.mark.parametrize("no_replace", [(True), (False)]) +def test_special_phrases_csv_command(temp_db, mock_func_factory, tokenizer_mock, no_replace): + 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: + call_nominatim('special-phrases', '--import-from-csv', csv_path, '--no-replace') + else: + call_nominatim('special-phrases', '--import-from-csv', csv_path) assert func.called == 1 @@ -242,7 +283,6 @@ def test_special_phrases_command(temp_db, mock_func_factory): ('postcodes', 'update_postcodes'), ('word-counts', 'recompute_word_counts'), ('address-levels', 'load_address_levels_from_file'), - ('functions', 'create_functions'), ('wiki-data', 'import_wikipedia_articles'), ('importance', 'recompute_importance'), ('website', 'setup_website'), @@ -254,6 +294,14 @@ def test_refresh_command(mock_func_factory, temp_db, command, func): assert func_mock.called == 1 +def test_refresh_create_functions(mock_func_factory, temp_db, tokenizer_mock): + func_mock = mock_func_factory(nominatim.tools.refresh, 'create_functions') + + assert 0 == call_nominatim('refresh', '--functions') + assert func_mock.called == 1 + assert tokenizer_mock.update_sql_functions_called + + def test_refresh_importance_computed_after_wiki_import(monkeypatch, temp_db): calls = [] monkeypatch.setattr(nominatim.tools.refresh, 'import_wikipedia_articles',