18 errors

Author: nhsdevws

backend/tests/sample_data/mock_redis_cache.py

@@ -27,12 +27,23 @@
     "MENACWY": "[{\"code\": \"23511006\", \"term\": \"Meningococcal infectious disease\"}]"
 }
 
-def fake_hget(name, key):
-    # Custom logic for your test
+
+def get_data(name):
     if name == "diseases_to_vacc":
-        if key in MOCK_REDIS_D2V_RESPONSE:
-            return MOCK_REDIS_D2V_RESPONSE[key]
+        return MOCK_REDIS_D2V_RESPONSE
     elif name == "vacc_to_diseases":
-        if key in MOCK_REDIS_V2D_RESPONSE:
-            return MOCK_REDIS_V2D_RESPONSE[key]
-    return None
+        return MOCK_REDIS_V2D_RESPONSE
+    return {}
+
+def fake_hget(name, key):
+    ret = get_data(name)
+    if key in ret:
+        return ret[key]
+    return {}
+
+def fake_hkeys(name):
+    ret = fake_hget(name)
+    # return all keys
+    if ret != {}:
+        return list(ret.keys())
+    return []

backend/tests/test_parameter_parser.py

@@ -14,7 +14,7 @@
     create_query_string,
     SearchParams,
 )
-from sample_data.mock_redis_cache import fake_hget
+from sample_data.mock_redis_cache import fake_hkeys
 
 class TestParameterParser(unittest.TestCase):
     def setUp(self):
@@ -28,7 +28,7 @@ def setUp(self):
         self.mock_logger_info = self.logger_info_patcher.start()
         self.redis_patcher = patch("parameter_parser.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
-        self.mock_redis_client.hget.side_effect = fake_hget
+        self.mock_redis_client.hkeys.side_effect = fake_hkeys
 
     def tearDown(self):
         patch.stopall()
@@ -120,9 +120,9 @@ def test_process_search_params_whitelists_immunization_target(self):
                     self.immunization_target_key: ["not-a-code"],
                 }
             )
-        self.assertEqual(
-            str(e.exception),
-            "immunization-target must be one or more of the following: COVID19, FLU, HPV, MMR, MMRV, RSV, PERTUSSIS, SHINGLES, PCV13, 3in1, MENACWY",
+        self.assertTrue(
+            str(e.exception).startswith("immunization-target must be one or more of the following:"),
+            f"Unexpected exception message: {str(e.exception)}"
         )
 
         params = process_search_params(