Removed lenient from EncounterMapperTest

Author: chiaramapellimt

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

@@ -4,7 +4,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.lenient;
+z
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;

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

@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -83,14 +82,8 @@ public class EncounterMapperTest {
 
     @BeforeEach
     void setUp() {
-        lenient().when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
-
         messageContext = new MessageContext(randomIdGeneratorService);
         messageContext.initialize(bundle);
-        lenient().when(bundle.getEntry()).thenReturn(List.of(
-            BUNDLE_ENTRY_WITH_CONSULTATION,
-            BUNDLE_ENTRY_WITH_LOCATION
-        ));
         encounterMapper = new EncounterMapper(messageContext, encounterComponentsMapper, confidentialityService);
     }
 
@@ -101,7 +94,14 @@ void tearDown() {
 
     @Test
     void testEncounterWithNOPATAddsConfidentialityCodeIntoEhrComposition() {
-        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+
+        when(bundle.getEntry()).thenReturn(List.of(
+                BUNDLE_ENTRY_WITH_CONSULTATION,
+                BUNDLE_ENTRY_WITH_LOCATION
+        ));
+
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
         var encounterJsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY + "input-encounter-with-nopat.json");
         var expectedOutputWithConfidentialityCode
@@ -120,7 +120,13 @@ void testEncounterWithNOPATAddsConfidentialityCodeIntoEhrComposition() {
     @ParameterizedTest
     @MethodSource("testFilePaths")
     void When_MappingParsedEncounterJson_Expect_EhrCompositionXmlOutput(String input, String output) {
-        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+        when(bundle.getEntry()).thenReturn(List.of(
+                BUNDLE_ENTRY_WITH_CONSULTATION,
+                BUNDLE_ENTRY_WITH_LOCATION
+        ));
+
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
 
         String expectedOutputMessage = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY + output);
@@ -134,6 +140,27 @@ void When_MappingParsedEncounterJson_Expect_EhrCompositionXmlOutput(String input
 
         verify(encounterComponentsMapper).mapComponents(parsedEncounter);
     }
+    @Test
+    void When_MappingParsedEncounterJson_Expect_EhrCompositionXmlOutputWithNulAuthor() {
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+        when(bundle.getEntry()).thenReturn(List.of(
+            BUNDLE_ENTRY_WITH_CONSULTATION,
+            BUNDLE_ENTRY_WITH_LOCATION
+        ));
+
+        var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
+
+        String expectedOutputMessage = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY + "output-with-nul-author-participant2.xml");
+
+        var jsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY + "input-without-recorder-participant.json");
+        Encounter parsedEncounter = new FhirParseService().parseResource(jsonInput, Encounter.class);
+        when(encounterComponentsMapper.mapComponents(parsedEncounter)).thenReturn(sampleComponent);
+
+        String outputMessage = encounterMapper.mapEncounterToEhrComposition(parsedEncounter);
+        assertThat(outputMessage).isEqualTo(expectedOutputMessage);
+
+        verify(encounterComponentsMapper).mapComponents(parsedEncounter);
+    }
 
     private static Stream<Arguments> testFilePaths() {
         return Stream.of(
@@ -153,7 +180,6 @@ private static Stream<Arguments> testFilePaths() {
                 "output-with-type-and-no-coding-and-text-and-no-text.xml"
             ),
             Arguments.of("input-without-performer-participant.json", "output-with-recorder-as-participant2.xml"),
-            Arguments.of("input-without-recorder-participant.json", "output-with-nul-author-participant2.xml"),
             Arguments.of("input-with-no-location-reference.json", "output-with-no-location-reference.xml")
         );
     }
@@ -175,8 +201,6 @@ void When_MappingEncounterWithNoType_Expect_Exception() {
 
     @Test
     void When_MappingEncounterLocationWithNoReference_Expect_Exception() {
-        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
-        lenient().when(bundle.getEntry()).thenReturn(List.of(BUNDLE_ENTRY_WITH_CONSULTATION));
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
 
         var jsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY
@@ -191,6 +215,11 @@ void When_MappingEncounterLocationWithNoReference_Expect_Exception() {
 
     @Test
     void When_MappingEncounterWithInvalidParticipantReferenceResourceType_Expect_Exception() {
+        when(bundle.getEntry()).thenReturn(List.of(
+                BUNDLE_ENTRY_WITH_CONSULTATION,
+                BUNDLE_ENTRY_WITH_LOCATION
+        ));
+
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
 
         var jsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY