addressing pitest complains

Author: ORybak5

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

@@ -90,6 +90,8 @@ class ObservationMapperTest {
         "observation_test_group_header.json";
     private static final String OBSERVATION_TEST_RESULT_JSON =
         "observation_test_result.json";
+    private static final String NOT_PRESENT_OBSERVATION_RESULT_JSON =
+        "not_present_observation.json";
     private static final String OBSERVATION_FILING_COMMENT_JSON =
         "observation_filing_comment.json";
     private static final String OBSERVATION_ASSOCIATED_WITH_IGNORED_MEMBER_JSON =
@@ -275,17 +277,17 @@ void When_MappingTestResult_With_NopatMetaSecurity_Expect_ConfidentialityCodeWit
 
     @Test
     void When_ObservationDoesNotContainNotPresentElements_Expect_MappedObservetionNotContainAggregateComments() {
-        final Observation observation = getObservationResourceFromJson(OBSERVATION_TEST_RESULT_JSON);
+        final Observation not_present_observation = getObservationResourceFromJson(NOT_PRESENT_OBSERVATION_RESULT_JSON);
+        String expression = "//component/NarrativeStatement/text[contains(normalize-space(.), 'AGGREGATE COMMENT SET')]";
 
-        ConfidentialityCodeUtility.appendNopatSecurityToMetaForResource(observation);
-        when(confidentialityService.generateConfidentialityCode(observation))
+        ConfidentialityCodeUtility.appendNopatSecurityToMetaForResource(not_present_observation);
+        when(confidentialityService.generateConfidentialityCode(not_present_observation))
             .thenReturn(Optional.of(NOPAT_HL7_CONFIDENTIALITY_CODE));
 
-        final String actualXml = observationMapper.mapObservationToCompoundStatement(observation);
-
-        String expression = "/component/NarrativeStatement/text[contains(normalize-space(.), 'AGGREGATE COMMENT SET')]";
+        final String actualXml = observationMapper.mapObservationToCompoundStatement(not_present_observation);
+        String wrappedXml = "<root>" + actualXml + "</root>";
 
-        assertThatXml(actualXml).doesNotContainXPath(expression);
+        assertThatXml(wrappedXml).containsXPath(expression);
     }
 
     @Test

service/src/test/resources/ehr/mapper/diagnosticreport/observation/not_present_observation.json

@@ -0,0 +1,55 @@
+{
+  "resourceType": "Observation",
+  "id": "NOT-PRESENT-OBSERVATION-32685afe-1d46-4d98-8279-39b9e96ee914",
+  "meta":
+  {
+    "profile": [
+      "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Observation-1"
+    ]
+  },
+  "identifier": [
+    {
+      "system": "https://tools.ietf.org/html/rfc4122",
+      "value": "2af46949-4938-4c57-bad4-c4363e1965d7"
+    }
+  ],
+  "status": "final",
+  "category": [
+    {
+      "coding": [
+        {
+          "system": "http://snomed.info/sct",
+          "code": "394595002",
+          "display": "Pathology"
+        }
+      ]
+    }
+  ],
+  "code": {
+    "coding": [
+      {
+        "system": "http://snomed.info/sct",
+        "code": "1022451000000103",
+        "display": "Red blood cell count"
+      }
+    ]
+  },
+  "subject": {
+    "reference": "Patient/11",
+    "display": "SKELLY, Horace"
+  },
+  "issued": "2019-04-06T12:00:00+00:00",
+  "performer": [
+    {
+      "reference": "Organization/7",
+      "display": "COXWOLD Surgery"
+    }
+  ],
+  "valueQuantity": {
+    "value": 4.5700000000000003,
+    "unit": "10*12/L"
+  },
+  "specimen": {
+    "reference": "Specimen/756a8361-79ce-4561-afcb-a91fe19df123"
+  }
+}