Merge pull request #2486 from lonvia/fix-special-phrases

[nominatim.git] / test / python / test_cli.py

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index c83ee3ddfba64e5fc880886275ed866cc2259e38..707be23bce5c8b34571fa4dc92e0bd086fed9641 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -144,6 +144,7 @@ class TestCliWithDb:
             def __init__(self, *args, **kwargs):
                 self.update_sql_functions_called = False
                 self.finalize_import_called = False
             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 update_sql_functions(self, *args):
                 self.update_sql_functions_called = True


@@ -151,6 +152,10 @@ class TestCliWithDb:
             def finalize_import(self, *args):
                 self.finalize_import_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)
         tok = DummyTokenizer()
         monkeypatch.setattr(nominatim.tokenizer.factory, 'get_tokenizer_for_db',
                             lambda *args: tok)


@@ -181,7 +186,7 @@ class TestCliWithDb:
             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.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_file'),
+            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.tools.postcodes, 'update_postcodes'),
             mock_func_factory(nominatim.indexer.indexer.Indexer, 'index_full'),
             mock_func_factory(nominatim.tools.refresh, 'setup_website'),


@@ -316,8 +321,7 @@ class TestCliWithDb:
         assert func.called == 1
 
     @pytest.mark.parametrize("command,func", [
         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'),
                              ('wiki-data', 'import_wikipedia_articles'),
                              ('importance', 'recompute_importance'),
                              ('website', 'setup_website'),


@@ -329,6 +333,11 @@ class TestCliWithDb:
         assert func_mock.called == 1
 
 
         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')
     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')