clean up test_utils

Author: nhsdevws

backend/tests/test_utils.py

@@ -17,7 +17,6 @@ def setUp(self):
         self.json_data = load_json_data(filename="completed_mmr_immunization_event.json")
         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
 
     def tearDown(self):
         """Tear down after each test. This runs after every test"""
@@ -38,6 +37,7 @@ def test_convert_disease_codes_to_vaccine_type(self):
             (["36653000", "14189004", "36989005"], "MMR"),
             (["55735004"], "RSV")
         ]
+        self.mock_redis_client.hget.side_effect = ['COVID19', 'FLU', 'HPV', 'MMR', 'MMR', 'MMR', 'RSV']
 
         for combination, vaccine_type in valid_combinations:
             self.assertEqual(convert_disease_codes_to_vaccine_type(combination), vaccine_type)
@@ -50,6 +50,8 @@ def test_convert_disease_codes_to_vaccine_type(self):
             ["14189004", "36989005", "36653000", "840539006"],
         ]
 
+        self.mock_redis_client.hget.side_effect = None
+        self.mock_redis_client.hget.return_value = None  # Simulate no match in Redis for invalid combinations
         for invalid_combination in invalid_combinations:
             with self.assertRaises(ValueError):
                 convert_disease_codes_to_vaccine_type(invalid_combination)
@@ -59,12 +61,14 @@ def test_get_vaccine_type(self):
         Test that get_vaccine_type returns the correct vaccine type when given valid json data with a
         valid combination of target disease code, or raises an appropriate error otherwise
         """
+        self.mock_redis_client.hget.return_value = 'RSV'
         # TEST VALID DATA
         valid_json_data = load_json_data(filename=f"completed_rsv_immunization_event.json")
         # print(valid_json_data)
         vac_type = get_vaccine_type(valid_json_data)
         self.assertEqual(vac_type, "RSV")
 
+        self.mock_redis_client.hget.return_value = "FLU"
         # VALID DATA: coding field with multiple coding systems including SNOMED
         flu_json_data = load_json_data(filename=f"completed_flu_immunization_event.json")
         valid_target_disease_element = {
@@ -77,6 +81,7 @@ def test_get_vaccine_type(self):
         self.assertEqual(get_vaccine_type(flu_json_data), "FLU")
 
         # TEST INVALID DATA FOR SINGLE TARGET DISEASE
+        self.mock_redis_client.hget.return_value = None  # Reset mock for invalid cases
         covid_19_json_data = load_json_data(
             filename=f"completed_covid19_immunization_event.json"
         )