X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5a245e33e08d3b0b825cb8f9b47214e1b221118e..4cc788f69e1191d2dd985aeac143597566529f24:/test/python/api/test_server_glue_v1.py diff --git a/test/python/api/test_server_glue_v1.py b/test/python/api/test_server_glue_v1.py index 6ea790c0..8d9f0940 100644 --- a/test/python/api/test_server_glue_v1.py +++ b/test/python/api/test_server_glue_v1.py @@ -2,7 +2,7 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2024 by the Nominatim developer community. +# Copyright (C) 2025 by the Nominatim developer community. # For a full list of authors see the git log. """ Tests for the Python web frameworks adaptor, v1 API. @@ -121,7 +121,6 @@ class TestAdaptorRaiseError: return excinfo.value - def test_without_content_set(self): err = self.run_raise_error('TEST', 404) @@ -129,7 +128,6 @@ class TestAdaptorRaiseError: assert err.msg == 'ERROR 404: TEST' assert err.status == 404 - def test_json(self): self.adaptor.content_type = 'application/json; charset=utf-8' @@ -139,7 +137,6 @@ class TestAdaptorRaiseError: assert content['code'] == 501 assert content['message'] == 'TEST' - def test_xml(self): self.adaptor.content_type = 'text/xml; charset=utf-8' @@ -235,7 +232,6 @@ class TestStatusEndpoint: monkeypatch.setattr(napi.NominatimAPIAsync, 'status', _status) - @pytest.mark.asyncio async def test_status_without_params(self): a = FakeAdaptor() @@ -247,7 +243,6 @@ class TestStatusEndpoint: assert resp.status == 200 assert resp.content_type == 'text/plain; charset=utf-8' - @pytest.mark.asyncio async def test_status_with_error(self): a = FakeAdaptor() @@ -259,7 +254,6 @@ class TestStatusEndpoint: assert resp.status == 500 assert resp.content_type == 'text/plain; charset=utf-8' - @pytest.mark.asyncio async def test_status_json_with_error(self): a = FakeAdaptor(params={'format': 'json'}) @@ -271,7 +265,6 @@ class TestStatusEndpoint: assert resp.status == 200 assert resp.content_type == 'application/json; charset=utf-8' - @pytest.mark.asyncio async def test_status_bad_format(self): a = FakeAdaptor(params={'format': 'foo'}) @@ -298,7 +291,6 @@ class TestDetailsEndpoint: monkeypatch.setattr(napi.NominatimAPIAsync, 'details', _lookup) - @pytest.mark.asyncio async def test_details_no_params(self): a = FakeAdaptor() @@ -306,7 +298,6 @@ class TestDetailsEndpoint: with pytest.raises(FakeError, match='^400 -- .*Missing'): await glue.details_endpoint(napi.NominatimAPIAsync(), a) - @pytest.mark.asyncio async def test_details_by_place_id(self): a = FakeAdaptor(params={'place_id': '4573'}) @@ -315,7 +306,6 @@ class TestDetailsEndpoint: assert self.lookup_args[0].place_id == 4573 - @pytest.mark.asyncio async def test_details_by_osm_id(self): a = FakeAdaptor(params={'osmtype': 'N', 'osmid': '45'}) @@ -326,7 +316,6 @@ class TestDetailsEndpoint: assert self.lookup_args[0].osm_id == 45 assert self.lookup_args[0].osm_class is None - @pytest.mark.asyncio async def test_details_with_debugging(self): a = FakeAdaptor(params={'osmtype': 'N', 'osmid': '45', 'debug': '1'}) @@ -337,7 +326,6 @@ class TestDetailsEndpoint: assert resp.content_type == 'text/html; charset=utf-8' assert content.tag == 'html' - @pytest.mark.asyncio async def test_details_no_result(self): a = FakeAdaptor(params={'place_id': '4573'}) @@ -353,14 +341,14 @@ class TestReverseEndPoint: @pytest.fixture(autouse=True) def patch_reverse_func(self, monkeypatch): self.result = napi.ReverseResult(napi.SourceTable.PLACEX, - ('place', 'thing'), - napi.Point(1.0, 2.0)) + ('place', 'thing'), + napi.Point(1.0, 2.0)) + async def _reverse(*args, **kwargs): return self.result monkeypatch.setattr(napi.NominatimAPIAsync, 'reverse', _reverse) - @pytest.mark.asyncio @pytest.mark.parametrize('params', [{}, {'lat': '3.4'}, {'lon': '6.7'}]) async def test_reverse_no_params(self, params): @@ -371,19 +359,6 @@ class TestReverseEndPoint: with pytest.raises(FakeError, match='^400 -- (?s:.*)missing'): await glue.reverse_endpoint(napi.NominatimAPIAsync(), a) - - @pytest.mark.asyncio - @pytest.mark.parametrize('params', [{'lat': '45.6', 'lon': '4563'}]) - async def test_reverse_success(self, params): - a = FakeAdaptor() - a.params = params - a.params['format'] = 'json' - - res = await glue.reverse_endpoint(napi.NominatimAPIAsync(), a) - - assert res == '' - - @pytest.mark.asyncio async def test_reverse_success(self): a = FakeAdaptor() @@ -392,7 +367,6 @@ class TestReverseEndPoint: assert await glue.reverse_endpoint(napi.NominatimAPIAsync(), a) - @pytest.mark.asyncio async def test_reverse_from_search(self): a = FakeAdaptor() @@ -413,12 +387,12 @@ class TestLookupEndpoint: self.results = [napi.SearchResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, 2.0))] + async def _lookup(*args, **kwargs): return napi.SearchResults(self.results) monkeypatch.setattr(napi.NominatimAPIAsync, 'lookup', _lookup) - @pytest.mark.asyncio async def test_lookup_no_params(self): a = FakeAdaptor() @@ -428,7 +402,6 @@ class TestLookupEndpoint: assert res.output == '[]' - @pytest.mark.asyncio @pytest.mark.parametrize('param', ['w', 'bad', '']) async def test_lookup_bad_params(self, param): @@ -440,7 +413,6 @@ class TestLookupEndpoint: assert len(json.loads(res.output)) == 1 - @pytest.mark.asyncio @pytest.mark.parametrize('param', ['p234234', '4563']) async def test_lookup_bad_osm_type(self, param): @@ -452,7 +424,6 @@ class TestLookupEndpoint: assert len(json.loads(res.output)) == 1 - @pytest.mark.asyncio async def test_lookup_working(self): a = FakeAdaptor() @@ -473,12 +444,12 @@ class TestSearchEndPointSearch: self.results = [napi.SearchResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, 2.0))] + async def _search(*args, **kwargs): return napi.SearchResults(self.results) monkeypatch.setattr(napi.NominatimAPIAsync, 'search', _search) - @pytest.mark.asyncio async def test_search_free_text(self): a = FakeAdaptor() @@ -488,7 +459,6 @@ class TestSearchEndPointSearch: assert len(json.loads(res.output)) == 1 - @pytest.mark.asyncio async def test_search_free_text_xml(self): a = FakeAdaptor() @@ -500,7 +470,6 @@ class TestSearchEndPointSearch: assert res.status == 200 assert res.output.index('something') > 0 - @pytest.mark.asyncio async def test_search_free_and_structured(self): a = FakeAdaptor() @@ -508,8 +477,7 @@ class TestSearchEndPointSearch: a.params['city'] = 'ignored' with pytest.raises(FakeError, match='^400 -- .*cannot be used together'): - res = await glue.search_endpoint(napi.NominatimAPIAsync(), a) - + await glue.search_endpoint(napi.NominatimAPIAsync(), a) @pytest.mark.asyncio @pytest.mark.parametrize('dedupe,numres', [(True, 1), (False, 2)]) @@ -532,12 +500,12 @@ class TestSearchEndPointSearchAddress: self.results = [napi.SearchResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, 2.0))] + async def _search(*args, **kwargs): return napi.SearchResults(self.results) monkeypatch.setattr(napi.NominatimAPIAsync, 'search_address', _search) - @pytest.mark.asyncio async def test_search_structured(self): a = FakeAdaptor() @@ -555,12 +523,12 @@ class TestSearchEndPointSearchCategory: self.results = [napi.SearchResult(napi.SourceTable.PLACEX, ('place', 'thing'), napi.Point(1.0, 2.0))] + async def _search(*args, **kwargs): return napi.SearchResults(self.results) monkeypatch.setattr(napi.NominatimAPIAsync, 'search_category', _search) - @pytest.mark.asyncio async def test_search_category(self): a = FakeAdaptor()