tidy

Author: nhsdevws

…dprocessor/tests/test_batch_processor.py …tests/test_recordprocessor_edge_cases.pyrecordprocessor/tests/test_batch_processor.py renamed to recordprocessor/tests/test_recordprocessor_edge_cases.py recordprocessor/tests/test_batch_processor.py renamed to recordprocessor/tests/test_recordprocessor_edge_cases.py

@@ -3,14 +3,10 @@
 from io import BytesIO
 from unittest.mock import patch
 from batch_processor import process_csv_to_fhir
+from tests.utils_for_recordprocessor_tests.utils_for_recordprocessor_tests import create_patch
 
 
-def create_patch(target: str):
-    patcher = patch(target)
-    return patcher.start()
-
-
-class TestProcessCsvToFhir(unittest.TestCase):
+class TestProcessorEdgeCases(unittest.TestCase):
 
     def setUp(self):
         self.mock_logger_info = create_patch("logging.Logger.info")

recordprocessor/tests/test_recordprocessor_main.py

@@ -23,6 +23,7 @@
     REGION_NAME,
 )
 from tests.utils_for_recordprocessor_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, Kinesis
+from tests.utils_for_recordprocessor_tests.utils_for_recordprocessor_tests import create_patch
 
 with patch("os.environ", MOCK_ENVIRONMENT_DICT):
     from constants import Diagnostics
@@ -52,6 +53,7 @@ def setUp(self) -> None:
             "code": "55735004",
             "term": "Respiratory syncytial virus infection (disorder)"
         }])
+        self.mock_logger_info = create_patch("logging.Logger.info")
 
     def tearDown(self) -> None:
         GenericTearDown(s3_client, firehose_client, kinesis_client)

recordprocessor/tests/utils_for_recordprocessor_tests/utils_for_recordprocessor_tests.py

@@ -102,3 +102,8 @@ def assert_audit_table_entry(file_details: FileDetails, expected_status: FileSta
         TableName=AUDIT_TABLE_NAME, Key={AuditTableKeys.MESSAGE_ID: {"S": file_details.message_id}}
     ).get("Item")
     assert table_entry == {**file_details.audit_table_entry, "status": {"S": expected_status}}
+
+
+def create_patch(target: str):
+    patcher = patch(target)
+    return patcher.start()