Fixed the import for MOCK

Author: chiaramapellimt

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

@@ -4,7 +4,11 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
 
 import java.util.Arrays;
@@ -78,34 +82,34 @@ void setup() {
     @Test
     void When_GettingExternalAttachments_Expect_AllDocumentReferenceResourcesAreMapped() {
         when(randomIdGeneratorService.createNewId()).thenReturn(
-            NEW_DOC_MANIFEST_ID_1,
-            NEW_DOC_MANIFEST_ID_2
+                NEW_DOC_MANIFEST_ID_1,
+                NEW_DOC_MANIFEST_ID_2
         );
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(
-            NEW_DOC_MANIFEST_ID_1,
-            NEW_DOC_MANIFEST_ID_2
+                NEW_DOC_MANIFEST_ID_1,
+                NEW_DOC_MANIFEST_ID_2
         );
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
         when(supportedContentTypes.isContentTypeSupported(any())).thenReturn(true);
 
         var mappedExternalAttachments = getMappedExternalAttachments(
-            buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, "text/plain"),
-            buildDocumentReference(ID_2, "/" + NEW_DOC_REF_ID_2, null, ATTACHMENT_2_SIZE, "text/html")
+                buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, "text/plain"),
+                buildDocumentReference(ID_2, "/" + NEW_DOC_REF_ID_2, null, ATTACHMENT_2_SIZE, "text/html")
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(
-            List.of(
-                buildExternalAttachment(
-                    NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
-                    "111_new_doc_manifest_id.txt", "text/plain",
-                    buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
-                ),
-                buildExternalAttachment(
-                    NEW_DOC_MANIFEST_ID_2, NEW_DOC_MANIFEST_ID_2, "/" + NEW_DOC_REF_ID_2, null,
-                    "222_new_doc_manifest_id.html", "text/html",
-                    buildAttachmentDescription(NEW_DOC_MANIFEST_ID_2)
+                List.of(
+                        buildExternalAttachment(
+                                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
+                                "111_new_doc_manifest_id.txt", "text/plain",
+                                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                        ),
+                        buildExternalAttachment(
+                                NEW_DOC_MANIFEST_ID_2, NEW_DOC_MANIFEST_ID_2, "/" + NEW_DOC_REF_ID_2, null,
+                                "222_new_doc_manifest_id.html", "text/html",
+                                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_2)
+                        )
                 )
-            )
         );
     }
 
@@ -116,13 +120,13 @@ void When_GettingExternalAttachment_WithWrongContentType_Expect_AbsentAttachment
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
 
         var mappedExternalAttachments = getMappedAbsentAttachments(
-            buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, UNSUPPORTED_CONTENT_TYPE)
+                buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, UNSUPPORTED_CONTENT_TYPE)
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(List.of(buildExternalAttachment(
-            NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
-            "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
-            buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
+                "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
+                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
         )));
     }
 
@@ -133,13 +137,13 @@ void When_GettingExternalAttachment_WithTitleAndNoUrl_Expect_AbsentAttachmentMap
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
 
         var mappedExternalAttachments = getMappedAbsentAttachments(
-            buildDocumentReference(ID_1, null, "some title", ATTACHMENT_1_SIZE, "text/plain")
+                buildDocumentReference(ID_1, null, "some title", ATTACHMENT_1_SIZE, "text/plain")
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(List.of(buildExternalAttachment(
-            NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, null, "some title",
-            "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
-            buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, null, "some title",
+                "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
+                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
         )));
     }
 
@@ -152,15 +156,16 @@ void When_GettingHL7_Expect_BundleAndStructuredRecordAreMapped() {
         var ehrExtractTemplateParameters = mock(EhrExtractTemplateParameters.class);
 
         when(ehrExtractMapper.mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle))
-            .thenReturn(ehrExtractTemplateParameters);
+                .thenReturn(ehrExtractTemplateParameters);
         when(ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters)).thenReturn(ehrExtractContent);
         when(outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent))
-            .thenReturn(expectedHL7);
+                .thenReturn(expectedHL7);
 
         var actualHL7 = structuredRecordMappingService.mapStructuredRecordToEhrExtractXml(structuredTaskDefinition, bundle);
 
         verify(ehrExtractMapper).mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
         verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
+        verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
         verify(outputMessageWrapperMapper).map(structuredTaskDefinition, ehrExtractContent);
 
         assertThat(actualHL7).isEqualTo(expectedHL7);
@@ -194,7 +199,7 @@ private Bundle getBundleWith(DocumentReference... documentReferences) {
         var bundle = new Bundle().addEntry(new Bundle.BundleEntryComponent().setResource(new Patient()));
 
         Arrays.stream(documentReferences).forEach(
-            documentReference -> bundle.addEntry(new Bundle.BundleEntryComponent().setResource(documentReference))
+                documentReference -> bundle.addEntry(new Bundle.BundleEntryComponent().setResource(documentReference))
         );
         return bundle;
     }
@@ -325,37 +330,37 @@ private static OutboundMessage.ExternalAttachment buildExternalAttachment(String
                                                                               String filename, String contentType,
                                                                               OutboundMessage.AttachmentDescription description) {
         return OutboundMessage.ExternalAttachment.builder()
-            .title(title)
-            .documentId(documentID)
-            .messageId(messageID)
-            .description(description.toString())
-            .url(url)
-            .filename(filename)
-            .identifier(List.of())
-            .contentType(contentType)
-            .build();
+                .title(title)
+                .documentId(documentID)
+                .messageId(messageID)
+                .description(description.toString())
+                .url(url)
+                .filename(filename)
+                .identifier(List.of())
+                .contentType(contentType)
+                .build();
     }
 
     private static OutboundMessage.AttachmentDescription buildAttachmentDescription(String documentId) {
         return OutboundMessage.AttachmentDescription.builder()
-            .fileName(null)
-            .contentType(null)
-            .compressed(false)
-            .largeAttachment(false)
-            .originalBase64(false)
-            .documentId(documentId)
-            .build();
+                .fileName(null)
+                .contentType(null)
+                .compressed(false)
+                .largeAttachment(false)
+                .originalBase64(false)
+                .documentId(documentId)
+                .build();
     }
 
     private static DocumentReference buildDocumentReference(String id, String attachmentURL, String attachmentTitle,
-        int size, String contentType) {
+                                                            int size, String contentType) {
         var documentReference = new DocumentReference();
         documentReference.setId(buildIdType(ResourceType.DocumentReference, id));
         documentReference.getContentFirstRep().setAttachment(new Attachment()
-            .setUrl(attachmentURL)
-            .setTitle(attachmentTitle)
-            .setSize(size)
-            .setContentType(contentType));
+                .setUrl(attachmentURL)
+                .setTitle(attachmentTitle)
+                .setSize(size)
+                .setContentType(contentType));
         return documentReference;
     }
 }