remock & tidy

Author: nhsdevws

backend/tests/test_fhir_controller.py

@@ -29,7 +29,6 @@
 from tests.utils.immunization_utils import create_covid_19_immunization
 from parameter_parser import patient_identifier_system, process_search_params, SearchParams
 from tests.utils.generic_utils import load_json_data
-from utils.mock_redis import mock_redis_hkeys
 
 
 class TestFhirControllerBase(unittest.TestCase):

backend/tests/test_fhir_service.py

@@ -23,7 +23,6 @@
 )
 from utils.generic_utils import load_json_data
 from constants import NHS_NUMBER_USED_IN_SAMPLE_DATA
-from utils.mock_redis import mock_redis_hget
 
 class TestFhirServiceBase(unittest.TestCase):
     """Base class for all tests to set up common fixtures"""
@@ -32,7 +31,6 @@ def setUp(self):
         super().setUp()
         self.redis_patcher = patch("models.utils.validation_utils.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
-        self.mock_redis_client.hget.side_effect = mock_redis_hget
         self.logger_info_patcher = patch("logging.Logger.info")
         self.mock_logger_info = self.logger_info_patcher.start()
 
@@ -140,6 +138,7 @@ def test_pre_validation_failed(self):
         self.imms_repo.update_immunization.assert_not_called()
 
     def test_post_validation_failed_get_by_all(self):
+        self.mock_redis_client.hget.side_effect = [None, 'COVID-19']
         valid_imms = create_covid_19_immunization_dict("an-id", VALID_NHS_NUMBER)
 
         bad_target_disease_imms = deepcopy(valid_imms)
@@ -260,6 +259,7 @@ def test_pre_validation_failed(self):
         self.pds_service.get_patient_details.assert_not_called()
 
     def test_post_validation_failed_get(self):
+        self.mock_redis_client.hget.side_effect = [None, 'COVID-19']
         valid_imms = create_covid_19_immunization_dict("an-id", VALID_NHS_NUMBER)
 
         bad_target_disease_imms = deepcopy(valid_imms)
@@ -412,7 +412,7 @@ def test_pre_validation_failed(self):
 
     def test_post_validation_failed_create(self):
         """it should throw exception if Immunization is not valid"""
-
+        self.mock_redis_client.hget.side_effect = [None, 'COVID-19']
         valid_imms = create_covid_19_immunization_dict_no_id(VALID_NHS_NUMBER)
 
         bad_target_disease_imms = deepcopy(valid_imms)

backend/tests/test_immunization_post_validator.py

@@ -17,8 +17,6 @@
 from tests.utils.mandation_test_utils import MandationTests
 from tests.utils.values_for_tests import NameInstances
 from tests.utils.generic_utils import update_contained_resource_field
-# import redis mock functions
-from utils.mock_redis import mock_redis_hget, mock_redis_hkeys
 
 class TestImmunizationModelPostValidationRules(unittest.TestCase):
     """Test immunization post validation rules on the FHIR model"""
@@ -99,7 +97,6 @@ def test_post_validate_and_set_vaccine_type(self):
             "protocolApplied[0].targetDisease[0].coding[?(@.system=='http://snomed.info/sct')].code"
         )
 
-        # self.mock_redis_client.hget.side_effect = mock_redis_hget
         self.mock_redis_client.hget.side_effect = [ "COVID19", "FLU",
             "HPV",
             "MMR",

backend/tests/test_parameter_parser.py

@@ -14,7 +14,6 @@
     create_query_string,
     SearchParams,
 )
-from utils.mock_redis import mock_redis_hkeys
 
 class TestParameterParser(unittest.TestCase):
     def setUp(self):

backend/tests/test_utils.py

@@ -4,7 +4,6 @@
 import json
 from unittest.mock import patch, MagicMock
 from copy import deepcopy
-from utils.mock_redis import mock_redis_hget
 
 from models.utils.validation_utils import convert_disease_codes_to_vaccine_type, get_vaccine_type
 from utils.generic_utils import load_json_data, update_target_disease_code