feat: update async_client tests

rewrite tests using pytest-aiohttp

Author: mnunzio

tests/test_async_client.py

@@ -3,17 +3,16 @@
 
 import aiohttp
 import pytest
-import requests.adapters
+from aiohttp import web
 
 import pyodata.v2.service
 from pyodata import Client
 from pyodata.exceptions import PyODataException, HttpError
 from pyodata.v2.model import ParserError, PolicyWarning, PolicyFatal, PolicyIgnore, Config
 
-SERVICE_URL = 'http://example.com'
+SERVICE_URL = ''
 
 
-@pytest.mark.asyncio
 async def test_invalid_odata_version():
     """Check handling of request for invalid OData version implementation"""
 
@@ -24,7 +23,6 @@ async def test_invalid_odata_version():
     assert str(e_info.value).startswith('No implementation for selected odata version')
 
 
-@pytest.mark.asyncio
 async def test_create_client_for_local_metadata(metadata):
     """Check client creation for valid use case with local metadata"""
 
@@ -37,68 +35,63 @@ async def test_create_client_for_local_metadata(metadata):
         assert len(service_client.schema.entity_sets) != 0
 
 
-@patch("pyodata.client._async_fetch_metadata")
+def generate_metadata_response(headers=None, body=None, status=200):
+    async def metadata_repsonse(request):
+        return web.Response(status=status, headers=headers, body=body)
+
+    return metadata_repsonse
+
+
 @pytest.mark.parametrize("content_type", ['application/xml', 'application/atom+xml', 'text/xml'])
-@pytest.mark.asyncio
-async def test_create_service_application(mock_fetch_metadata, metadata, content_type):
+async def test_create_service_application(aiohttp_client, metadata, content_type):
     """Check client creation for valid MIME types"""
-    mock_fetch_metadata.return_value = metadata
 
-    async with aiohttp.ClientSession() as client:
-        service_client = await Client.build_async_client(SERVICE_URL, client)
+    app = web.Application()
+    app.router.add_get('/$metadata', generate_metadata_response(headers={'content-type': content_type}, body=metadata))
+    client = await aiohttp_client(app)
 
-        assert isinstance(service_client, pyodata.v2.service.Service)
+    service_client = await Client.build_async_client(SERVICE_URL, client)
 
-        # one more test for '/' terminated url
+    assert isinstance(service_client, pyodata.v2.service.Service)
 
-        service_client = await Client.build_async_client(SERVICE_URL + '/', requests)
+    # one more test for '/' terminated url
 
-        assert isinstance(service_client, pyodata.v2.service.Service)
-        assert service_client.schema.is_valid
+    service_client = await Client.build_async_client(SERVICE_URL + '/', client)
+
+    assert isinstance(service_client, pyodata.v2.service.Service)
+    assert service_client.schema.is_valid
 
 
-@patch("aiohttp.client.ClientSession.get")
-@pytest.mark.asyncio
-async def test_metadata_not_reachable(mock):
+async def test_metadata_not_reachable(aiohttp_client):
     """Check handling of not reachable service metadata"""
 
-    response = AsyncMock()
-    response.status = 404
-    response.headers = {'content-type': 'text/html'}
-    mock.return_value.__aenter__.return_value = response
+    app = web.Application()
+    app.router.add_get('/$metadata', generate_metadata_response(headers={'content-type': 'text/html'}, status=404))
+    client = await aiohttp_client(app)
 
     with pytest.raises(HttpError) as e_info:
-        async with aiohttp.ClientSession() as client:
-            await Client.build_async_client(SERVICE_URL, client)
+        await Client.build_async_client(SERVICE_URL, client)
 
     assert str(e_info.value).startswith('Metadata request failed')
 
 
-@patch("aiohttp.client.ClientSession.get")
-@pytest.mark.asyncio
-async def test_metadata_saml_not_authorized(mock):
+async def test_metadata_saml_not_authorized(aiohttp_client):
     """Check handling of not SAML / OAuth unauthorized response"""
 
-    response = AsyncMock()
-    response.status = 200
-    response.headers = {'content-type': 'text/html; charset=utf-8'}
-    mock.return_value.__aenter__.return_value = response
+    app = web.Application()
+    app.router.add_get('/$metadata', generate_metadata_response(headers={'content-type': 'text/html; charset=utf-8'}))
+    client = await aiohttp_client(app)
 
     with pytest.raises(HttpError) as e_info:
-        async with aiohttp.ClientSession() as client:
-            await Client.build_async_client(SERVICE_URL, client)
+        await Client.build_async_client(SERVICE_URL, client)
 
     assert str(e_info.value).startswith('Metadata request did not return XML, MIME type:')
 
 
-@patch("pyodata.client._async_fetch_metadata")
 @patch('warnings.warn')
-@pytest.mark.asyncio
-async def test_client_custom_configuration(mock_warning, mock_fetch_metadata, metadata):
+async def test_client_custom_configuration(mock_warning, aiohttp_client, metadata):
     """Check client creation for custom configuration"""
 
-    mock_fetch_metadata.return_value = metadata
-
     namespaces = {
         'edmx': "customEdmxUrl.com",
         'edm': 'customEdmUrl.com'
@@ -112,14 +105,16 @@ async def test_client_custom_configuration(mock_warning, mock_fetch_metadata, me
             ParserError.ASSOCIATION: PolicyIgnore()
         })
 
+    app = web.Application()
+    app.router.add_get('/$metadata', generate_metadata_response(headers={'content-type': 'application/xml'},body=metadata))
+    client = await aiohttp_client(app)
+
     with pytest.raises(PyODataException) as e_info:
-        async with aiohttp.ClientSession() as client:
-            await Client.build_async_client(SERVICE_URL, client, config=custom_config, namespaces=namespaces)
+        await Client.build_async_client(SERVICE_URL, client, config=custom_config, namespaces=namespaces)
 
     assert str(e_info.value) == 'You cannot pass namespaces and config at the same time'
 
-    async with aiohttp.ClientSession() as client:
-        service = await Client.build_async_client(SERVICE_URL, client, namespaces=namespaces)
+    service = await Client.build_async_client(SERVICE_URL, client, namespaces=namespaces)
 
     mock_warning.assert_called_with(
         'Passing namespaces directly is deprecated. Use class Config instead',
@@ -128,8 +123,7 @@ async def test_client_custom_configuration(mock_warning, mock_fetch_metadata, me
     assert isinstance(service, pyodata.v2.service.Service)
     assert service.schema.config.namespaces == namespaces
 
-    async with aiohttp.ClientSession() as client:
-        service = await Client.build_async_client(SERVICE_URL, client, config=custom_config)
+    service = await Client.build_async_client(SERVICE_URL, client, config=custom_config)
 
     assert isinstance(service, pyodata.v2.service.Service)
     assert service.schema.config == custom_config