X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6c67a4b500cf08b3cfce96e74b2658deb4696c05..1f0796778754d8df0dfab9dd01302e26a397f064:/test/python/cli/test_cmd_api.py?ds=sidebyside diff --git a/test/python/cli/test_cmd_api.py b/test/python/cli/test_cmd_api.py index cff83cef..1c0750d1 100644 --- a/test/python/cli/test_cmd_api.py +++ b/test/python/cli/test_cmd_api.py @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2023 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Tests for API access commands of command-line interface wrapper. @@ -10,45 +10,17 @@ Tests for API access commands of command-line interface wrapper. import json import pytest -import nominatim.clicmd.api -import nominatim.api as napi +import nominatim_db.clicmd.api +import nominatim_api as napi +@pytest.mark.parametrize('call', ['search', 'reverse', 'lookup', 'details', 'status']) +def test_list_format(cli_call, call): + assert 0 == cli_call(call, '--list-formats') -@pytest.mark.parametrize("endpoint", (('search', 'reverse', 'lookup', 'details', 'status'))) -def test_no_api_without_phpcgi(endpoint): - assert nominatim.cli.nominatim(module_dir='MODULE NOT AVAILABLE', - osm2pgsql_path='OSM2PGSQL NOT AVAILABLE', - phpcgi_path=None, - cli_args=[endpoint]) == 1 - -@pytest.mark.parametrize("params", [('search', '--query', 'new'), - ('search', '--city', 'Berlin'), - ('lookup', '--id', 'N1')]) -class TestCliApiCallPhp: - - @pytest.fixture(autouse=True) - def setup_cli_call(self, params, cli_call, mock_func_factory, tmp_path): - self.mock_run_api = mock_func_factory(nominatim.clicmd.api, 'run_api_script') - - def _run(): - return cli_call(*params, '--project-dir', str(tmp_path)) - - self.run_nominatim = _run - - - def test_api_commands_simple(self, tmp_path, params): - (tmp_path / 'website').mkdir() - (tmp_path / 'website' / (params[0] + '.php')).write_text('') - - assert self.run_nominatim() == 0 - - assert self.mock_run_api.called == 1 - assert self.mock_run_api.last_args[0] == params[0] - - - def test_bad_project_dir(self): - assert self.run_nominatim() == 1 +@pytest.mark.parametrize('call', ['search', 'reverse', 'lookup', 'details', 'status']) +def test_bad_format(cli_call, call): + assert 1 == cli_call(call, '--format', 'rsdfsdfsdfsaefsdfsd') class TestCliStatusCall: @@ -81,8 +53,8 @@ class TestCliDetailsCall: result = napi.DetailedResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, -3.0)) - monkeypatch.setattr(napi.NominatimAPI, 'lookup', - lambda *args: result) + monkeypatch.setattr(napi.NominatimAPI, 'details', + lambda *args, **kwargs: result) @pytest.mark.parametrize("params", [('--node', '1'), ('--way', '1'), @@ -104,10 +76,12 @@ class TestCliReverseCall: result = napi.ReverseResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, -3.0), names={'name':'Name', 'name:fr': 'Nom'}, - extratags={'extra':'Extra'}) + extratags={'extra':'Extra'}, + locale_name='Name', + display_name='Name') monkeypatch.setattr(napi.NominatimAPI, 'reverse', - lambda *args: result) + lambda *args, **kwargs: result) def test_reverse_simple(self, cli_call, tmp_path, capsys): @@ -146,91 +120,56 @@ class TestCliReverseCall: assert out['type'] == 'FeatureCollection' - def test_reverse_language(self, cli_call, tmp_path, capsys): - result = cli_call('reverse', '--project-dir', str(tmp_path), - '--lat', '34', '--lon', '34', '--lang', 'fr') - - assert result == 0 - - out = json.loads(capsys.readouterr().out) - assert out['name'] == 'Nom' - - -QUERY_PARAMS = { - 'search': ('--query', 'somewhere'), - 'reverse': ('--lat', '20', '--lon', '30'), - 'lookup': ('--id', 'R345345'), - 'details': ('--node', '324') -} - -@pytest.mark.parametrize("endpoint", (('search', 'lookup'))) -class TestCliApiCommonParameters: +class TestCliLookupCall: @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"""