Merge remote-tracking branch 'upstream/master'

[nominatim.git] / 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 26e6517e53b4fe3dc8e5031d67c6d1c1b148835c..5ef169045e0a4712c256bf38d2634a4bbae6e146 100644 (file)
--- 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)
 #
 #
 # 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 the Python web frameworks adaptor, v1 API.
 # For a full list of authors see the git log.
 """
 Tests for the Python web frameworks adaptor, v1 API.


@@ -15,9 +15,9 @@ import pytest
 
 from fake_adaptor import FakeAdaptor, FakeError, FakeResponse
 
 
 from fake_adaptor import FakeAdaptor, FakeError, FakeResponse
 

-import nominatim.api.v1.server_glue as glue
-import nominatim.api as napi
-import nominatim.api.logging as loglib
+import nominatim_api.v1.server_glue as glue
+import nominatim_api as napi
+import nominatim_api.logging as loglib

 
 
 # ASGIAdaptor.get_int/bool()
 
 
 # ASGIAdaptor.get_int/bool()


@@ -59,52 +59,52 @@ def test_adaptor_get_bool_falsish():
 def test_adaptor_parse_format_use_default():
     adaptor = FakeAdaptor()
 
 def test_adaptor_parse_format_use_default():
     adaptor = FakeAdaptor()
 

-    assert adaptor.parse_format(napi.StatusResult, 'text') == 'text'
+    assert glue.parse_format(adaptor, napi.StatusResult, 'text') == 'text'

     assert adaptor.content_type == 'text/plain; charset=utf-8'
 
 
 def test_adaptor_parse_format_use_configured():
     adaptor = FakeAdaptor(params={'format': 'json'})
 
     assert adaptor.content_type == 'text/plain; charset=utf-8'
 
 
 def test_adaptor_parse_format_use_configured():
     adaptor = FakeAdaptor(params={'format': 'json'})
 

-    assert adaptor.parse_format(napi.StatusResult, 'text') == 'json'
-    assert adaptor.content_type == 'application/json'
+    assert glue.parse_format(adaptor, napi.StatusResult, 'text') == 'json'
+    assert adaptor.content_type == 'application/json; charset=utf-8'

 
 
 def test_adaptor_parse_format_invalid_value():
     adaptor = FakeAdaptor(params={'format': '@!#'})
 
     with pytest.raises(FakeError, match='^400 -- .*must be one of'):
 
 
 def test_adaptor_parse_format_invalid_value():
     adaptor = FakeAdaptor(params={'format': '@!#'})
 
     with pytest.raises(FakeError, match='^400 -- .*must be one of'):

-        adaptor.parse_format(napi.StatusResult, 'text')
+        glue.parse_format(adaptor, napi.StatusResult, 'text')

 
 
 # ASGIAdaptor.get_accepted_languages()
 
 def test_accepted_languages_from_param():
     a = FakeAdaptor(params={'accept-language': 'de'})
 
 
 # ASGIAdaptor.get_accepted_languages()
 
 def test_accepted_languages_from_param():
     a = FakeAdaptor(params={'accept-language': 'de'})

-    assert a.get_accepted_languages() == 'de'
+    assert glue.get_accepted_languages(a) == 'de'

 
 
 def test_accepted_languages_from_header():
     a = FakeAdaptor(headers={'accept-language': 'de'})
 
 
 def test_accepted_languages_from_header():
     a = FakeAdaptor(headers={'accept-language': 'de'})

-    assert a.get_accepted_languages() == 'de'
+    assert glue.get_accepted_languages(a) == 'de'

 
 
 def test_accepted_languages_from_default(monkeypatch):
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'de')
     a = FakeAdaptor()
 
 
 def test_accepted_languages_from_default(monkeypatch):
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'de')
     a = FakeAdaptor()

-    assert a.get_accepted_languages() == 'de'
+    assert glue.get_accepted_languages(a) == 'de'

 
 
 def test_accepted_languages_param_over_header():
     a = FakeAdaptor(params={'accept-language': 'de'},
                     headers={'accept-language': 'en'})
 
 
 def test_accepted_languages_param_over_header():
     a = FakeAdaptor(params={'accept-language': 'de'},
                     headers={'accept-language': 'en'})

-    assert a.get_accepted_languages() == 'de'
+    assert glue.get_accepted_languages(a) == 'de'

 
 
 def test_accepted_languages_header_over_default(monkeypatch):
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'en')
     a = FakeAdaptor(headers={'accept-language': 'de'})
 
 
 def test_accepted_languages_header_over_default(monkeypatch):
     monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'en')
     a = FakeAdaptor(headers={'accept-language': 'de'})

-    assert a.get_accepted_languages() == 'de'
+    assert glue.get_accepted_languages(a) == 'de'

 
 
 # ASGIAdaptor.raise_error()
 
 
 # ASGIAdaptor.raise_error()


@@ -114,7 +114,7 @@ class TestAdaptorRaiseError:
     @pytest.fixture(autouse=True)
     def init_adaptor(self):
         self.adaptor = FakeAdaptor()
     @pytest.fixture(autouse=True)
     def init_adaptor(self):
         self.adaptor = FakeAdaptor()

-        self.adaptor.setup_debugging()
+        glue.setup_debugging(self.adaptor)

 
     def run_raise_error(self, msg, status):
         with pytest.raises(FakeError) as excinfo:
 
     def run_raise_error(self, msg, status):
         with pytest.raises(FakeError) as excinfo:


@@ -127,12 +127,12 @@ class TestAdaptorRaiseError:
         err = self.run_raise_error('TEST', 404)
 
         assert self.adaptor.content_type == 'text/plain; charset=utf-8'
         err = self.run_raise_error('TEST', 404)
 
         assert self.adaptor.content_type == 'text/plain; charset=utf-8'

-        assert err.msg == 'TEST'
+        assert err.msg == 'ERROR 404: TEST'

         assert err.status == 404
 
 
     def test_json(self):
         assert err.status == 404
 
 
     def test_json(self):

-        self.adaptor.content_type = 'application/json'
+        self.adaptor.content_type = 'application/json; charset=utf-8'

 
         err = self.run_raise_error('TEST', 501)
 
 
         err = self.run_raise_error('TEST', 501)
 


@@ -155,7 +155,7 @@ class TestAdaptorRaiseError:
 
 def test_raise_error_during_debug():
     a = FakeAdaptor(params={'debug': '1'})
 
 def test_raise_error_during_debug():
     a = FakeAdaptor(params={'debug': '1'})

-    a.setup_debugging()
+    glue.setup_debugging(a)

     loglib.log().section('Ongoing')
 
     with pytest.raises(FakeError) as excinfo:
     loglib.log().section('Ongoing')
 
     with pytest.raises(FakeError) as excinfo:


@@ -172,7 +172,7 @@ def test_raise_error_during_debug():
 # ASGIAdaptor.build_response
 
 def test_build_response_without_content_type():
 # ASGIAdaptor.build_response
 
 def test_build_response_without_content_type():

-    resp = FakeAdaptor().build_response('attention')
+    resp = glue.build_response(FakeAdaptor(), 'attention')

 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200
 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200


@@ -182,33 +182,33 @@ def test_build_response_without_content_type():
 
 def test_build_response_with_status():
     a = FakeAdaptor(params={'format': 'json'})
 
 def test_build_response_with_status():
     a = FakeAdaptor(params={'format': 'json'})

-    a.parse_format(napi.StatusResult, 'text')
+    glue.parse_format(a, napi.StatusResult, 'text')

 
 

-    resp = a.build_response('stuff\nmore stuff', status=404)
+    resp = glue.build_response(a, 'stuff\nmore stuff', status=404)

 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 404
     assert resp.output == 'stuff\nmore stuff'
 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 404
     assert resp.output == 'stuff\nmore stuff'

-    assert resp.content_type == 'application/json'
+    assert resp.content_type == 'application/json; charset=utf-8'

 
 
 def test_build_response_jsonp_with_json():
     a = FakeAdaptor(params={'format': 'json', 'json_callback': 'test.func'})
 
 
 def test_build_response_jsonp_with_json():
     a = FakeAdaptor(params={'format': 'json', 'json_callback': 'test.func'})

-    a.parse_format(napi.StatusResult, 'text')
+    glue.parse_format(a, napi.StatusResult, 'text')

 
 

-    resp = a.build_response('{}')
+    resp = glue.build_response(a, '{}')

 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200
     assert resp.output == 'test.func({})'
 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200
     assert resp.output == 'test.func({})'

-    assert resp.content_type == 'application/javascript'
+    assert resp.content_type == 'application/javascript; charset=utf-8'

 
 
 def test_build_response_jsonp_without_json():
     a = FakeAdaptor(params={'format': 'text', 'json_callback': 'test.func'})
 
 
 def test_build_response_jsonp_without_json():
     a = FakeAdaptor(params={'format': 'text', 'json_callback': 'test.func'})

-    a.parse_format(napi.StatusResult, 'text')
+    glue.parse_format(a, napi.StatusResult, 'text')

 
 

-    resp = a.build_response('{}')
+    resp = glue.build_response(a, '{}')

 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200
 
     assert isinstance(resp, FakeResponse)
     assert resp.status == 200


@@ -219,10 +219,10 @@ def test_build_response_jsonp_without_json():
 @pytest.mark.parametrize('param', ['alert(); func', '\\n', '', 'a b'])
 def test_build_response_jsonp_bad_format(param):
     a = FakeAdaptor(params={'format': 'json', 'json_callback': param})
 @pytest.mark.parametrize('param', ['alert(); func', '\\n', '', 'a b'])
 def test_build_response_jsonp_bad_format(param):
     a = FakeAdaptor(params={'format': 'json', 'json_callback': param})

-    a.parse_format(napi.StatusResult, 'text')
+    glue.parse_format(a, napi.StatusResult, 'text')

 
     with pytest.raises(FakeError, match='^400 -- .*Invalid'):
 
     with pytest.raises(FakeError, match='^400 -- .*Invalid'):

-        a.build_response('{}')
+        glue.build_response(a, '{}')

 
 
 # status_endpoint()
 
 
 # status_endpoint()


@@ -270,7 +270,7 @@ class TestStatusEndpoint:
 
         assert isinstance(resp, FakeResponse)
         assert resp.status == 200
 
         assert isinstance(resp, FakeResponse)
         assert resp.status == 200

-        assert resp.content_type == 'application/json'
+        assert resp.content_type == 'application/json; charset=utf-8'

 
 
     @pytest.mark.asyncio
 
 
     @pytest.mark.asyncio


@@ -508,9 +508,8 @@ class TestSearchEndPointSearch:
         a.params['q'] = 'something'
         a.params['city'] = 'ignored'
 
         a.params['q'] = 'something'
         a.params['city'] = 'ignored'
 

-        res = await glue.search_endpoint(napi.NominatimAPIAsync(Path('/invalid')), a)
-
-        assert len(json.loads(res.output)) == 1
+        with pytest.raises(FakeError, match='^400 -- .*cannot be used together'):
+            res = await glue.search_endpoint(napi.NominatimAPIAsync(Path('/invalid')), a)

 
 
     @pytest.mark.asyncio
 
 
     @pytest.mark.asyncio