Added integration coverage, removed lenient()

Author: chiaramapellimt

service/src/intTest/java/uk/nhs/adaptors/gp2gp/ehr/SendEhrExtractCoreComponentTest.java

@@ -52,6 +52,7 @@
 import uk.nhs.adaptors.gp2gp.mhs.MhsRequestBuilder;
 import uk.nhs.adaptors.gp2gp.mhs.exception.MhsConnectionException;
 import uk.nhs.adaptors.gp2gp.mhs.exception.MhsServerErrorException;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.mhs.model.OutboundMessage;
 import uk.nhs.adaptors.gp2gp.testcontainers.ActiveMQExtension;
 import uk.nhs.adaptors.gp2gp.testcontainers.MongoDBExtension;
@@ -356,6 +357,20 @@ public void When_ExtractCoreThrowsMhsServerErrorException_Expect_ExceptionThrown
         assertThat(ehrExtractStatusUpdated.getEhrExtractCore()).isNull();
     }
 
+    @Test
+    public void When_EhrExtractMapperFailsWithEhrValidationException_Expect_ExceptionThrownAndDbNotUpdated() {
+        doThrow(EhrValidationException.class)
+                .when(ehrDocumentMapper).generateMhsPayload(any(), anyString(), anyString(), anyString());
+
+        assertThatExceptionOfType(EhrValidationException.class)
+                .isThrownBy(() -> sendEhrExtractCoreTaskExecutor.execute(sendEhrExtractCoreTaskDefinition));
+
+        var ehrExtractStatusUpdated = reloadEhrStatus();
+
+        assertThat(ehrExtractStatusUpdated.getEhrExtractCore()).isNull();
+
+    }
+
     @BeforeEach
     public void prepareCommonStubbing() {
         when(gp2gpConfiguration.getLargeEhrExtractThreshold()).thenReturn(BinaryUtils.getBytesLengthOfString(SEVENTEEN_BYTE_PAYLOAD) - 1);

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

@@ -6,7 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.lenient;
+
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -97,7 +97,7 @@ void When_BundleHasNoMappableContent_Expect_EhrValidationExceptionIsThrown() {
                 .build();
         var bundle = mock(Bundle.class);
 
-        lenient().when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any(Bundle.class)))
+        when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any(Bundle.class)))
                 .thenReturn(Collections.emptyList());
 
         EhrValidationException thrown = assertThrows(EhrValidationException.class, () ->