tidy

Author: nhsdevws

backend/tests/test_immunization_pre_validator.py

@@ -24,37 +24,17 @@
     practitioner_name_given_field_location,
     practitioner_name_family_field_location,
 )
-from .utils.pre_validation_test_utils import ValidatorModelTests
-from .utils.values_for_tests import ValidValues, InvalidValues
-from models.obtain_field_value import ObtainFieldValue
-
+from utils.pre_validation_test_utils import ValidatorModelTests
+from utils.values_for_tests import ValidValues, InvalidValues
+from utils.mock_redis import MOCK_REDIS_D2V_RESPONSE
 
 class TestImmunizationModelPreValidationRules(unittest.TestCase):
     """Test immunization pre validation rules on the FHIR model using the covid sample data"""
 
-    MOCK_REDIS_D2V_RESPONSE = json.dumps({
-        "4740000": "SHINGLES",
-        "6142004": "FLU",
-        "16814004": "PCV13",
-        "23511006": "MENACWY",
-        "27836007": "PERTUSSIS",
-        "55735004": "RSV",
-        "240532009": "HPV",
-        "840539006": "COVID19",
-        "14189004:36653000:36989005": "MMR",
-        "14189004:36653000:36989005:38907003": "MMRV",
-        "397430003:398102009:76902006": "3in1"
-    })
-
     def setUp(self):
         """Set up for each test. This runs before every test"""
         self.json_data = load_json_data(filename="completed_covid19_immunization_event.json")
         self.validator = ImmunizationValidator(add_post_validators=False)
-        # redis_patcher = mock.patch("redis.StrictRedis", return_value=MockRedisClient())
-        # self.addCleanup(redis_patcher.stop)
-        # redis_patcher.start()
-        # patch clients.redis_client
-        # @patch('models.utils.validation_utils.redis_client.hget')
         self.redis_patcher = patch("models.utils.validation_utils.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
 
@@ -720,7 +700,7 @@ def test_pre_validate_missing_valueCodeableConcept2(self):
 
     def test_pre_validate_missing_valueCodeableConcept3(self):
         # Test case: valid data (should not raise an exception)
-        self.mock_redis_client.hget.return_value = self.MOCK_REDIS_D2V_RESPONSE
+        self.mock_redis_client.hget.return_value = MOCK_REDIS_D2V_RESPONSE
         valid_json_data = deepcopy(self.json_data)
         try:
             self.validator.validate(valid_json_data)