Removed Lenient from EncounterComponentsMapperTest and ObservationToNarrativeStatementMapperTest

Author: chiaramapellimt

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

@@ -18,8 +18,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
+import org.mockito.MockitoAnnotations;
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
@@ -43,11 +42,9 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
 
-@MockitoSettings(strictness = Strictness.LENIENT)
 class EncounterComponentsMapperTest {
     private static final String TEST_ID = "394559384658936";
     private static final String PRACTITIONER_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
@@ -114,6 +111,7 @@ class EncounterComponentsMapperTest {
 
     @BeforeEach
     public void setUp() {
+        MockitoAnnotations.openMocks(this);
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
         when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
@@ -139,9 +137,7 @@ public void setUp() {
                 "bloodPressureCode1", "bloodPressureCode2", "bloodPressureCode3"
             ))
         ))).thenReturn(true);
-        lenient()
-            .when(codeableConceptCdMapper.getCdForCategory())
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
+        when(codeableConceptCdMapper.getCdForCategory()).thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
         messageContext = new MessageContext(randomIdGeneratorService);
 
         ParticipantMapper participantMapper = new ParticipantMapper();

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

@@ -23,17 +23,13 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.utils.ResourceTestFileUtils;
 
 @ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class ObservationToNarrativeStatementMapperTest {
     private static final String TEST_ID = "394559384658936";
     private static final String TEST_FILE_DIRECTORY = "/ehr/mapper/observation/";
@@ -68,7 +64,6 @@ class ObservationToNarrativeStatementMapperTest {
 
     @BeforeEach
     void setUp() {
-        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
 
         messageContext = new MessageContext(randomIdGeneratorService);
@@ -86,6 +81,8 @@ void tearDown() {
     @ParameterizedTest
     @MethodSource("resourceFileParams")
     void When_MappingObservationJson_Expect_NarrativeStatementXmlOutput(String inputJson, String outputXml) {
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+
         messageContext.getAgentDirectory().getAgentId(buildReference(ResourceType.Practitioner, "something"));
         messageContext.getAgentDirectory().getAgentId(buildReference(ResourceType.Organization, "something"));
 
@@ -144,16 +141,17 @@ void When_MappingObservationWithInvalidParticipantResourceType_Expect_MapperExce
     @ParameterizedTest
     @MethodSource("resourceFileParamsThrowError")
     void When_MappingObservationWithAttachmentAndSampleData_Expect_MapperException(String inputJson, Class expectedClass) {
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+
         var jsonInput = ResourceTestFileUtils.getFileContent(inputJson);
         Observation parsedObservation = new FhirParseService().parseResource(jsonInput, Observation.class);
-
         var exception = assertThrows(EhrMapperException.class, () ->
-            observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(parsedObservation, true));
-
+                observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(parsedObservation, true));
         assertThat(exception.getMessage()).isEqualTo(String.format(
-            "Observation value type %s not supported.", expectedClass));
+                "Observation value type %s not supported.", expectedClass));
     }
 
+
     private static Stream<Arguments> resourceFileParamsThrowError() {
         return Stream.of(
             Arguments.of(INPUT_JSON_WITH_SAMPLED_DATA_VALUE, SampledData.class),