unit test improvements -- now testing the contents of the files we upload too

Author: ddurham2

tests/aiohttp/test_aiohttp_multipart.py

@@ -2,6 +2,7 @@
 
 import aiohttp
 import pytest
+from pathlib import Path
 
 from connexion import AioHttpApp
 
@@ -37,13 +38,17 @@ async def test_single_file_upload(aiohttp_app, aiohttp_client):
     data = await resp.json()
     assert resp.status == 200
     assert data['fileName'] == f'{__name__}.py'
+    assert data['content'] == Path(__file__).read_bytes().decode('utf8')
 
 
 async def test_many_files_upload(aiohttp_app, aiohttp_client):
     app_client = await aiohttp_client(aiohttp_app.app)
 
     dir_name = os.path.dirname(__file__)
-    files_field = [('files', open(f'{dir_name}/{file_name}', 'rb')) for file_name in os.listdir(dir_name) if file_name.endswith('.py')]
+    files_field = [
+        ('files', open(f'{dir_name}/{file_name}', 'rb')) \
+            for file_name in os.listdir(dir_name) if file_name.endswith('.py')
+    ]
 
     form_data = aiohttp.FormData(fields=files_field)
 
@@ -75,13 +80,18 @@ async def test_mixed_multipart_single_file(aiohttp_app, aiohttp_client):
     assert resp.status == 200
     assert data['dirName'] == os.path.dirname(__file__)
     assert data['fileName'] == f'{__name__}.py'
+    assert data['content'] == Path(__file__).read_bytes().decode('utf8')
+
 
 
 async def test_mixed_multipart_many_files(aiohttp_app, aiohttp_client):
     app_client = await aiohttp_client(aiohttp_app.app)
 
     dir_name = os.path.dirname(__file__)
-    files_field = [('files', open(f'{dir_name}/{file_name}', 'rb')) for file_name in os.listdir(dir_name) if file_name.endswith('.py')]
+    files_field = [
+        ('files', open(f'{dir_name}/{file_name}', 'rb')) \
+            for file_name in sorted(os.listdir(dir_name)) if file_name.endswith('.py')
+    ]
 
     form_data = aiohttp.FormData(fields=files_field)
     form_data.add_field('dirName', os.path.dirname(__file__))
@@ -98,3 +108,7 @@ async def test_mixed_multipart_many_files(aiohttp_app, aiohttp_client):
     assert data['dirName'] == os.path.dirname(__file__)
     assert data['testCount'] == len(files_field)
     assert data['filesCount'] == len(files_field)
+    assert data['contents'] == [
+        Path(f'{dir_name}/{file_name}').read_bytes().decode('utf8') \
+            for file_name in sorted(os.listdir(dir_name)) if file_name.endswith('.py')
+    ]

tests/fakeapi/aiohttp_handlers.py

@@ -88,7 +88,7 @@ async def get_uuid():
 
 async def aiohttp_multipart_single_file(funky_funky):
     return aiohttp.web.json_response(
-        data={'fileName': funky_funky.filename},
+        data={'fileName': funky_funky.filename, 'content': funky_funky.file.read().decode('utf8')},
     )
 
 
@@ -103,6 +103,7 @@ async def aiohttp_multipart_mixed_single_file(dir_name, funky_funky):
         data={
             'dirName': dir_name,
             'fileName': funky_funky.filename,
+            'content': funky_funky.file.read().decode('utf8'),
         },
     )
 
@@ -113,5 +114,6 @@ async def aiohttp_multipart_mixed_many_files(dir_name, test_count, files):
             'filesCount': len(files),
             'dirName': dir_name,
             'testCount': test_count,
+            'contents': [ f.file.read().decode('utf8') for f in files ]
         },
     )