test record processor amendments

Author: CLJ2006

recordprocessor/tests/utils_for_recordprocessor_tests/generic_setup_and_teardown.py

@@ -1,7 +1,6 @@
 """Generic setup and teardown for recordprocessor tests"""
 
 from unittest.mock import patch
-from boto3 import client as boto3_client
 
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import (
     BucketNames,
@@ -13,13 +12,7 @@
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from clients import REGION_NAME
-    from constants import (
-        AuditTableKeys,
-        AUDIT_TABLE_QUEUE_NAME_GSI,
-        AUDIT_TABLE_FILENAME_GSI,
-        AUDIT_TABLE_NAME,
-        AUDIT_TABLE_NAME,
-    )
+    from constants import AuditTableKeys, AUDIT_TABLE_QUEUE_NAME_GSI, AUDIT_TABLE_FILENAME_GSI, AUDIT_TABLE_NAME
 
 
 class GenericSetUp:
@@ -87,7 +80,6 @@ def __init__(self, s3_client=None, firehose_client=None, sqs_client=None, dynamo
                     },
                 ],
             )
-        print(f"set up: {AUDIT_TABLE_NAME}")
 
 
 class GenericTearDown:
@@ -113,5 +105,4 @@ def __init__(self, s3_client=None, firehose_client=None, sqs_client=None, dynamo
             sqs_client.delete_queue(QueueUrl=Sqs.TEST_QUEUE_URL)
 
         if dynamodb_client:
-            print(f"TEARTHISDOWN: {AUDIT_TABLE_NAME}")
             dynamodb_client.delete_table(TableName=AUDIT_TABLE_NAME)

recordprocessor/tests/utils_for_recordprocessor_tests/utils_for_recordprocessor_tests.py

@@ -1,8 +1,6 @@
 """Utils for the recordprocessor tests"""
 
-from csv import DictReader
 from io import StringIO
-from tests.utils_for_recordprocessor_tests.values_for_recordprocessor_tests import REGION_NAME
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import BucketNames, Firehose, Kinesis
 from tests.utils_for_recordprocessor_tests.values_for_recordprocessor_tests import MockFileDetails, FileDetails
 from boto3.dynamodb.types import TypeDeserializer

recordprocessor/tests/utils_for_recordprocessor_tests/values_for_recordprocessor_tests.py

@@ -187,15 +187,15 @@ def __init__(self, vaccine_type: str, supplier: str, ods_code: str, file_number:
 class MockFileDetails:
     """Class containing mock file details for use in tests"""
 
-    ravs_rsv_1 = FileDetails("RAVS", "RSV", "X26", file_number=1)
-    ravs_rsv_2 = FileDetails("RAVS", "RSV", "X26", file_number=2)
-    ravs_rsv_3 = FileDetails("RAVS", "RSV", "X26", file_number=3)
-    ravs_rsv_4 = FileDetails("RAVS", "RSV", "X26", file_number=4)
-    ravs_rsv_5 = FileDetails("RAVS", "RSV", "X26", file_number=5)
+    ravs_rsv_1 = FileDetails("RSV", "RAVS", "X26", file_number=1)
+    ravs_rsv_2 = FileDetails("RSV", "RAVS", "X26", file_number=2)
+    ravs_rsv_3 = FileDetails("RSV", "RAVS", "X26", file_number=3)
+    ravs_rsv_4 = FileDetails("RSV", "RAVS", "X26", file_number=4)
+    ravs_rsv_5 = FileDetails("RSV", "RAVS", "X26", file_number=5)
     rsv_ravs = FileDetails("RSV", "RAVS", "X26")
     rsv_emis = FileDetails("RSV", "EMIS", "8HK48")
     flu_emis = FileDetails("FLU", "EMIS", "YGM41")
-    ravs_flu = FileDetails("RAVS", "FLU", "X26")
+    ravs_flu = FileDetails("FLU", "RSV", "X26")
 
 
 class UnorderedFieldDictionaries: