update unit tests for additonal coverage (#184)

Author: brandold

sonar-project.properties

@@ -14,9 +14,11 @@ sonar.sources= \
     source/api
 
 
-# sonar.exclusions= 
+sonar.exclusions= \
+    test/
 
-# sonar.tests=source/
+sonar.tests= \
+    test/unit
 
 sonar.sourceEncoding=UTF-8
 

test/unit/api/service_responses.py

@@ -100,6 +100,34 @@
     },
 }
 
+
+efs_describe_file_systems_marker_response = {
+    'FileSystems': [
+        {
+            'CreationTime': datetime.now(),
+            'CreationToken': 'tokenstring',
+            'FileSystemId': f'{test_filesystem_id}',
+            'LifeCycleState': 'available',
+            'Name': 'MyFileSystem',
+            'NumberOfMountTargets': 1,
+            'OwnerId': '012345678912',
+            'PerformanceMode': 'generalPurpose',
+            'SizeInBytes': {
+                'Value': 6144,
+            },
+            'Tags': [
+                {
+                    'Key': 'Name',
+                    'Value': 'MyFileSystem',
+                },
+            ],
+        },
+    ],
+    'ResponseMetadata': {
+        '...': '...',
+    },
+}
+
 efs_describe_mount_targets_response = {
     'MountTargets': [
         {
@@ -237,7 +265,7 @@
 
 
 
-EFS = {'describe_file_systems_no_marker': efs_describe_file_systems_no_marker_response, 'describe_mount_targets': efs_describe_mount_targets_response, 'describe_mount_target_security_groups': efs_describe_mount_target_security_groups_response}
+EFS = {'describe_file_systems_no_marker': efs_describe_file_systems_no_marker_response, 'describe_file_systems_marker': efs_describe_file_systems_marker_response, 'describe_mount_targets': efs_describe_mount_targets_response, 'describe_mount_target_security_groups': efs_describe_mount_target_security_groups_response}
 CFN = {'describe_stacks': cfn_describe_stacks_response, 'create_stack': cfn_create_stack_response}
 LAMBDA = {'upload': lambda_invoke_upload_response, 'delete': lambda_invoke_delete_response, 'list': lambda_invoke_list_response, 'make_dir': lambda_invoke_make_dir_response, 'download': lambda_invoke_download_response}
 EC2 = {'describe_sec_rules': ec2_describe_security_group_rules_response}

test/unit/api/test_app.py

@@ -46,6 +46,40 @@ def test_list_filesystems(test_client, efs_client_stub, cfn_client_stub):
     print('PASS')
 
 
+def test_list_filesystems_paginated(test_client, efs_client_stub, cfn_client_stub):
+    print('GET /filesystems')
+
+    efs_client_stub.add_response(
+        'describe_file_systems',
+        expected_params={'MaxItems': 10, 'Marker': 'xyz'},
+        service_response=EFS['describe_file_systems_marker']
+    )
+
+    cfn_client_stub.add_response(
+        'describe_stacks',
+        expected_params={'StackName': f'testStackPrefix-ManagedResources-{test_filesystem_id}'},
+        service_response=CFN['describe_stacks']
+    )
+    response = test_client.http.get('/filesystems?cursor=xyz')
+
+    formatted_response = json.loads(response.body)
+    
+    print(formatted_response)
+
+    expected_response_keys = ['filesystems']
+
+    assert all(item in formatted_response.keys() for item in expected_response_keys)
+    
+    filesystems = formatted_response['filesystems']
+
+    assert isinstance(filesystems, list)
+    assert filesystems[0]['name'] == 'MyFileSystem'
+    assert filesystems[0]['managed'] is True
+    assert filesystems[0]['file_system_id'] == f'{test_filesystem_id}'
+
+    print('PASS')
+
+
 def test_get_netinfo_for_filesystem(test_client, efs_client_stub, ec2_client_stub):
     print(f'GET /filesystems/{test_filesystem_id}/netinfo')
 

test/unit/coverage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="6.5.0" timestamp="1665697912978" lines-valid="413" lines-covered="330" line-rate="0.799" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="6.5.0" timestamp="1665699515859" lines-valid="413" lines-covered="333" line-rate="0.8063" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
@@ -133,9 +133,9 @@
 				</class>
 			</classes>
 		</package>
-		<package name=".Users.brandold.werkplace.solutions.simple-file-manager-for-amazon-efs.source.api" line-rate="0.8074" branch-rate="0" complexity="0">
+		<package name=".Users.brandold.werkplace.solutions.simple-file-manager-for-amazon-efs.source.api" line-rate="0.8176" branch-rate="0" complexity="0">
 			<classes>
-				<class name="app.py" filename="/Users/brandold/werkplace/solutions/simple-file-manager-for-amazon-efs/source/api/app.py" complexity="0" line-rate="0.8074" branch-rate="0">
+				<class name="app.py" filename="/Users/brandold/werkplace/solutions/simple-file-manager-for-amazon-efs/source/api/app.py" complexity="0" line-rate="0.8176" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="13" hits="1"/>
@@ -266,13 +266,13 @@
 						<line number="317" hits="1"/>
 						<line number="319" hits="1"/>
 						<line number="321" hits="1"/>
-						<line number="322" hits="0"/>
-						<line number="323" hits="0"/>
+						<line number="322" hits="1"/>
+						<line number="323" hits="1"/>
 						<line number="324" hits="0"/>
 						<line number="325" hits="0"/>
 						<line number="327" hits="1"/>
 						<line number="328" hits="1"/>
-						<line number="329" hits="0"/>
+						<line number="329" hits="1"/>
 						<line number="334" hits="1"/>
 						<line number="337" hits="0"/>
 						<line number="338" hits="0"/>