VED-350: test not being picked, resolving coverage issues

Author: Akol125

backend/src/models/utils/pre_validator_utils.py

@@ -142,7 +142,7 @@ def for_date_time(field_value: str, field_location: str, strict_timezone: bool =
                 continue
 
         raise ValueError(error_message)
- 
+
     @staticmethod
     def for_snomed_code(field_value: str, field_location: str):
         """

backend/tests/utils/generic_utils.py

@@ -92,71 +92,3 @@ def update_contained_resource_field(
         {field_to_update: update_value}
     )
     return json_data
-
-
-import unittest
-
-# from your_module import form_json  # <-- import your function
-
-class TestFormJson(unittest.TestCase):
-    def setUp(self):
-        self.baseurl = "https://api.service.nhs.uk/immunisation-fhir-api/Immunization"
-        self.identifier = "abc123"
-        # matches your repo wrapper shape
-        self.response = {
-            "resource": {"resourceType": "Immunization", "id": "abc123", "status": "completed"},
-            "id": "abc123",
-            "version": 2,
-        }
-
-    def test_no_response(self):
-        out = form_json(None, None, self.identifier, self.baseurl)
-        self.assertEqual(out["resourceType"], "Bundle")
-        self.assertEqual(out["type"], "searchset")
-        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
-        self.assertEqual(out["entry"], [])
-        self.assertEqual(out["total"], 0)
-
-    def test_identifier_only_returns_full_resource(self):
-        out = form_json(self.response, None, self.identifier, self.baseurl)
-        self.assertEqual(out["total"], 1)
-        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
-        self.assertDictEqual(out["entry"][0]["resource"], self.response["resource"])
-        self.assertEqual(out["entry"][0]["fullUrl"], f"{self.baseurl}/{self.response['id']}")
-
-    def test_identifier_with_id_element_truncates_to_id(self):
-        out = form_json(self.response, "id", self.identifier, self.baseurl)
-        res = out["entry"][0]["resource"]
-        self.assertEqual(out["total"], 1)
-        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id")
-        self.assertEqual(res["resourceType"], "Immunization")
-        self.assertEqual(res["id"], self.response["id"])
-        self.assertNotIn("meta", res)
-
-    def test_identifier_with_meta_element_truncates_to_meta(self):
-        out = form_json(self.response, "meta", self.identifier, self.baseurl)
-        res = out["entry"][0]["resource"]
-        self.assertEqual(out["total"], 1)
-        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=meta")
-        self.assertEqual(res["resourceType"], "Immunization")
-        self.assertEqual(res["id"], self.response["id"])
-        self.assertIn("meta", res)
-        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
-
-    def test_identifier_with_id_and_meta_elements_truncates_both(self):
-        out = form_json(self.response, "id,meta", self.identifier, self.baseurl)
-        res = out["entry"][0]["resource"]
-        self.assertEqual(out["total"], 1)
-        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id,meta")
-        self.assertEqual(res["resourceType"], "Immunization")
-        self.assertEqual(res["id"], self.response["id"])
-        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
-
-    def test_elements_whitespace_and_case_are_handled(self):
-        out = form_json(self.response, "  ID ,  MeTa  ", self.identifier, self.baseurl)
-        res = out["entry"][0]["resource"]
-        self.assertEqual(res["id"], self.response["id"])
-        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
-
-if __name__ == "__main__":
-    unittest.main()

backend/tests/utils/test_generic_utils.py

@@ -0,0 +1,71 @@
+"""Generic utils for tests"""
+
+
+import unittest
+from src.models.utils.generic_utils import form_json
+
+
+class TestFormJson(unittest.TestCase):
+    def setUp(self):
+        self.baseurl = "https://api.service.nhs.uk/immunisation-fhir-api/Immunization"
+        self.identifier = "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184"
+        self.response = {
+            "resource": {"resourceType": "Immunization", "id": "f10b59b3-fc73-4616-99c9-9e882ab31184", "status": "completed"},
+            "id": "f10b59b3-fc73-4616-99c9-9e882ab31184",
+            "version": 2,
+        }
+
+    def test_no_response(self):
+        out = form_json(None, None, self.identifier, self.baseurl)
+        self.assertEqual(out["resourceType"], "Bundle")
+        self.assertEqual(out["type"], "searchset")
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
+        self.assertEqual(out["entry"], [])
+        self.assertEqual(out["total"], 0)
+
+    def test_identifier_only_returns_full_resource(self):
+        out = form_json(self.response, None, self.identifier, self.baseurl)
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
+        self.assertDictEqual(out["entry"][0]["resource"], self.response["resource"])
+        self.assertEqual(out["entry"][0]["fullUrl"], f"{self.baseurl}/{self.response['id']}")
+
+    def test_identifier_with_id_element_truncates_to_id(self):
+        out = form_json(self.response, "id", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertNotIn("meta", res)
+
+    def test_identifier_with_meta_element_truncates_to_meta(self):
+        out = form_json(self.response, "meta", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=meta")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertIn("meta", res)
+        self.assertEqual(res["meta"]["versionId"], self.response["version"])
+
+    def test_identifier_with_id_and_meta_elements_truncates_both(self):
+        out = form_json(self.response, "id,meta", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id,meta")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertIn("meta", res)
+        self.assertEqual(res["meta"]["versionId"], self.response["version"])
+
+    def test_elements_whitespace_and_case_are_handled(self):
+        raw_elements = "  ID ,  MeTa  "
+        out = form_json(self.response, raw_elements, self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(
+            out["link"][0]["url"],
+            f"{self.baseurl}?identifier={self.identifier}&_elements={raw_elements}"
+        )
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertEqual(res["meta"]["versionId"], self.response["version"])