[NIAD-3217] Basic test implementation, fixed test data

Author: martin-nhs

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapperTest.java

@@ -291,9 +291,29 @@ void When_DiagnosticReport_With_NoReferencedSpecimenAndFilingCommentWithNoCommen
         assertThat(actualXml).isEqualToIgnoringWhitespace(expectedXml);
     }
 
+    /**
+     * TODO
+     *
+     * It makes no sense whatsoever to place any logic within the SpecimenMapper - what we care
+     * about here is a DiagnosticReport with a Test Result (Observation). If the Observation has
+     * a related specimen - then this should be picked up by the SpecimenMapper.
+     *
+     * If there is an Observation (Test Result) WITHOUT a Specimen, then this I think should be handled
+     * within the ObservationMapper.
+     */
+
     @Test
     void When_DiagnosticReport_With_SpecimenAndTestResultWithNoSpecimen_Expect_TestResultDataToBePresentWithinObservationStatement() {
+        final String diagnosticReportFileName = "diagnostic-report-with-one-specimen-and-test-result-with-no-specimen.json";
+        final DiagnosticReport diagnosticReport = getDiagnosticReportResourceFromJson(diagnosticReportFileName);
+        final Bundle bundle = getBundleResourceFromJson(INPUT_JSON_BUNDLE);
+        final InputBundle inputBundle = new InputBundle(bundle);
+
+        when(messageContext.getInputBundleHolder()).thenReturn(inputBundle);
+
+        final String actualXml = mapper.mapDiagnosticReportToCompoundStatement(diagnosticReport);
 
+        assertThat(actualXml).contains("ObservationStatement");
     }
 
     private Bundle getBundleResourceFromJson(String filename) {

service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-one-specimen-and-test-result-with-no-specimen.json

@@ -1,41 +1,39 @@
 {
-  "resource": {
-    "resourceType": "DiagnosticReport",
-    "id": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC",
-    "meta": {
-      "profile": [
-        "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-DiagnosticReport-1"
-      ]
-    },
-    "identifier": [
-      {
-        "system": "https://wiremock/",
-        "value": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC"
-      }
-    ],
-    "status": "unknown",
-    "code": {
-      "coding": [
-        {
-          "system": "http://snomed.info/sct",
-          "code": "721981007",
-          "display": "Diagnostic studies report"
-        }
-      ]
-    },
-    "subject": {
-      "reference": "Patient/DAED5527-1985-45D9-993E-C5FF51F36828"
-    },
-    "issued": "2001-02-03T09:00:00+00:00",
-    "specimen": [
-      {
-        "reference": "Specimen/NON-SIGNIFICANT-SPECIMEN"
-      }
-    ],
-    "result": [
+  "resourceType": "DiagnosticReport",
+  "id": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC",
+  "meta": {
+    "profile": [
+      "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-DiagnosticReport-1"
+    ]
+  },
+  "identifier": [
+    {
+      "system": "https://wiremock/",
+      "value": "486785FA-C3A5-4AB2-B317-FF9C24A3FDBC"
+    }
+  ],
+  "status": "unknown",
+  "code": {
+    "coding": [
       {
-        "reference": "Observation/TEST-RESULT-NO-SPECIMEN"
+        "system": "http://snomed.info/sct",
+        "code": "721981007",
+        "display": "Diagnostic studies report"
       }
     ]
-  }
+  },
+  "subject": {
+    "reference": "Patient/DAED5527-1985-45D9-993E-C5FF51F36828"
+  },
+  "issued": "2001-02-03T09:00:00+00:00",
+  "specimen": [
+    {
+      "reference": "Specimen/NON-SIGNIFICANT-SPECIMEN"
+    }
+  ],
+  "result": [
+    {
+      "reference": "Observation/TEST-RESULT-NO-SPECIMEN"
+    }
+  ]
 }