From: Tareq Al-Ahdal Date: Wed, 30 Mar 2022 14:06:59 +0000 (+0800) Subject: separate unit test function into three functions X-Git-Tag: v4.1.0~64^2~6 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b5f311d6bc0325001324a1814bc61410081712d2 separate unit test function into three functions --- diff --git a/test/python/tools/test_country_info.py b/test/python/tools/test_country_info.py index ae3432e7..949dc206 100644 --- a/test/python/tools/test_country_info.py +++ b/test/python/tools/test_country_info.py @@ -60,38 +60,38 @@ def test_create_country_names(temp_db_with_extensions, temp_db_conn, temp_db_cur assert result_set == {'us' : set(('us', 'us1', 'us2', 'United States')), 'fr' : set(('fr', 'Fra', 'Fren'))} -@pytest.mark.parametrize("yaml_file_content", ( -""" + +def test_setup_country_config_languages_not_loaded(project_env, def_config): + (project_env.project_dir / 'country_settings.yaml').write_text(""" de: partition: 3 names: name: default: Deutschland -""", -""" +""") + country_info.setup_country_config(def_config) + assert country_info._COUNTRY_INFO._info.values() == {'de': {'partition': 3, + 'languages': [], 'names': {'name': {'default': 'Deutschland'}}}} + + +def test_setup_country_config_name_not_loaded(project_env, def_config): + (project_env.project_dir / 'country_settings.yaml').write_text(""" de: partition: 3 languages: de names: -""", -""" +""",) + country_info.setup_country_config(def_config) + assert country_info._COUNTRY_INFO._info == {'de': {'partition': 3, + 'languages': 'de', 'names': {'name': {}}}} + + +def test_setup_country_config_names_not_loaded(project_env, def_config): + (project_env.project_dir / 'country_settings.yaml').write_text(""" de: partition: 3 languages: de -""" -)) -def test_load(project_env, def_config, yaml_file_content): - (project_env.project_dir / 'country_settings.yaml').write_text(yaml_file_content) - - country_info._COUNTRY_INFO._info = def_config.load_sub_configuration( - (project_env.project_dir / 'country_settings.yaml')) - - for prop in country_info._COUNTRY_INFO._info.values(): - if 'languages' not in prop: - prop['languages'] = [] - assert country_info._COUNTRY_INFO._info == {'de': {'partition': 3, - 'languages': [], 'names': {'name': {'default': 'Deutschland'}}}} - if 'names' not in prop or prop['names'] is None: - prop['names'] = {'name': {}} - assert country_info._COUNTRY_INFO._info == {'de': {'partition': 3, - 'languages': 'de', 'names': {'name': {}}}} \ No newline at end of file +""") + country_info.setup_country_config(def_config) + assert country_info._COUNTRY_INFO._info == {'de': {'partition': 3, + 'languages': 'de', 'names': {'name': {}}}}