Test coverage increased

Author: chiaramapellimt

service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java

@@ -3,11 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
+import static org.mockito.Mockito.*;
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
 
 import java.util.Arrays;
@@ -30,6 +27,7 @@
 import uk.nhs.adaptors.gp2gp.common.configuration.Gp2gpConfiguration;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.ehr.EhrExtractStatusService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.XmlSchemaValidationException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.EhrExtractMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
@@ -280,6 +278,40 @@ void When_BuildingSkeletonForEhrExtractWithoutChildComponentNodesToReplace_Expec
         assertXMLEquals(skeletonEhrExtract, expectedSkeletonEhrExtract);
     }
 
+    @Test
+    void When_XmlSchemaValidationFails_Expect_ErrorLoggedAndProcessingContinues() {
+        var structuredTaskDefinition = mock(GetGpcStructuredTaskDefinition.class);
+        var bundle = mock(Bundle.class);
+        var ehrExtractTemplateParameters = mock(EhrExtractTemplateParameters.class);
+
+        var ehrExtractContent = "<EhrExtract>some invalid content</EhrExtract>";
+        var expectedHL7 = "some wrapped hl7 message";
+        var conversationId = "conversation-id";
+        var ehrExtractId = "ehr-extract-id";
+
+        when(ehrExtractMapper.mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle))
+                .thenReturn(ehrExtractTemplateParameters);
+        when(ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters)).thenReturn(ehrExtractContent);
+        when(ehrExtractTemplateParameters.getEhrExtractId()).thenReturn(ehrExtractId);
+        when(structuredTaskDefinition.getConversationId()).thenReturn(conversationId);
+        when(outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent))
+                .thenReturn(expectedHL7);
+
+        doThrow(new XmlSchemaValidationException("Invalid XML", new RuntimeException("Invalid XML")))
+                .when(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
+
+        var actualHL7 = structuredRecordMappingService.mapStructuredRecordToEhrExtractXml(structuredTaskDefinition, bundle);
+
+        verify(ehrExtractMapper).mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
+        verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
+        verify(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
+        verify(outputMessageWrapperMapper).map(structuredTaskDefinition, ehrExtractContent);
+        verify(ehrExtractStatusService).saveEhrExtractMessageId(conversationId, ehrExtractId);
+
+        assertThat(actualHL7).isEqualTo(expectedHL7);
+    }
+
+
     public static void assertXMLEquals(String actualXML, String expectedXML) throws Exception {
         XMLUnit.setIgnoreWhitespace(true);