Removed lenient from BloodPressureMapperTest

Author: chiaramapellimt

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

@@ -27,7 +27,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
@@ -80,8 +79,6 @@ public class BloodPressureMapperTest {
 
     @BeforeEach
     public void setUp() {
-        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
-        lenient().when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
         messageContext = new MessageContext(randomIdGeneratorService);
         messageContext.initialize(new Bundle());
         bloodPressureMapper = new BloodPressureMapper(
@@ -97,6 +94,8 @@ public void tearDown() {
 
     @Test
     public void When_MappingBloodPressureWithNopat_Expect_CompoundStatementWithConfidentialityCode() {
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(mockCodeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))
             .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
 
@@ -114,6 +113,8 @@ public void When_MappingBloodPressureWithNopat_Expect_CompoundStatementWithConfi
 
     @Test
     public void When_MappingEmptyObservation_Expect_CompoundStatementXmlReturned() {
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(any()))
+                .thenReturn("5E496953-065B-41F2-9577-BE8F2FBD0757");
         when(mockCodeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))
             .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
 
@@ -128,6 +129,9 @@ public void When_MappingEmptyObservation_Expect_CompoundStatementXmlReturned() {
 
     @Test
     public void When_MappingBloodPressureWithNestedTrue_Expect_CompoundStatementXmlReturned() {
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(any()))
+                .thenReturn("5E496953-065B-41F2-9577-BE8F2FBD0757");
         when(mockCodeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))
             .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
 
@@ -143,6 +147,9 @@ public void When_MappingBloodPressureWithNestedTrue_Expect_CompoundStatementXmlR
     @ParameterizedTest
     @MethodSource("testArguments")
     public void When_MappingBloodPressure_Expect_CompoundStatementXmlReturned(String inputJson, String outputXml) {
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(any()))
+                .thenReturn("5E496953-065B-41F2-9577-BE8F2FBD0757");
         when(mockCodeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))
             .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
 
@@ -173,6 +180,7 @@ private static Stream<Arguments> testArguments() {
 
     @Test
     public void When_MappingBloodPressureWithCodeableConcepts_Expect_CompoundStatementXmlReturned() {
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(any()))
             .thenReturn("5E496953-065B-41F2-9577-BE8F2FBD0757");
 
@@ -193,7 +201,8 @@ messageContext, randomIdGeneratorService, new StructuredObservationValueMapper()
 
     @Test
     public void When_MappingBloodPressureWithNoCodeableConcepts_Expect_Exception() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(BLOOD_PRESSURE_FILE_LOCATION + INPUT_BLOOD_PRESSURE_WITH_NO_CODEABLE_CONCEPTS);
+        var jsonInput = ResourceTestFileUtils
+                .getFileContent(BLOOD_PRESSURE_FILE_LOCATION + INPUT_BLOOD_PRESSURE_WITH_NO_CODEABLE_CONCEPTS);
 
         CodeableConceptCdMapper codeableConceptCdMapper = new CodeableConceptCdMapper();
         bloodPressureMapper = new BloodPressureMapper(