code test coverage threshold increase

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/common/storage/S3StorageConnector.java

@@ -13,9 +13,9 @@ public class S3StorageConnector implements StorageConnector {
     private final S3Client s3client;
     private final String bucketName;
 
-    protected S3StorageConnector(StorageConnectorConfiguration configuration) {
+    protected S3StorageConnector(S3Client s3client, StorageConnectorConfiguration configuration) {
         this.bucketName = configuration.getContainerName();
-        this.s3client = S3Client.builder().build();
+        this.s3client = s3client;
     }
 
     @Override

service/src/main/java/uk/nhs/adaptors/gp2gp/common/storage/StorageConnectorFactory.java

@@ -3,6 +3,7 @@
 import org.springframework.beans.factory.FactoryBean;
 
 import lombok.Setter;
+import software.amazon.awssdk.services.s3.S3Client;
 
 @Setter
 public class StorageConnectorFactory implements FactoryBean<StorageConnector> {
@@ -15,7 +16,7 @@ public StorageConnector getObject() {
         if (storageConnector == null) {
             switch (StorageConnectorOptions.enumOf(configuration.getType())) {
                 case S3:
-                    storageConnector = new S3StorageConnector(configuration);
+                    storageConnector = new S3StorageConnector(S3Client.builder().build(), configuration);
                     break;
                 case AZURE:
                     storageConnector = new AzureStorageConnector();

service/src/test/java/uk/nhs/adaptors/gp2gp/common/storage/S3StorageConnectorTest.java

@@ -0,0 +1,62 @@
+package uk.nhs.adaptors.gp2gp.common.storage;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import java.io.ByteArrayInputStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class S3StorageConnectorTest {
+
+    private static final String FILE_NAME = "test-file.txt";
+    private S3StorageConnector s3StorageConnector;
+    private StorageConnectorConfiguration config;
+    @Mock
+    private S3Client mockS3Client;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+
+        config = new StorageConnectorConfiguration();
+        config.setContainerName("s3Bucket");
+
+        s3StorageConnector = new S3StorageConnector(mockS3Client, config);
+    }
+
+
+    @Test
+    void expectExceptionWhenS3ClientCantDeliverResponse() {
+        s3StorageConnector = new S3StorageConnector(S3Client.builder().build(), config);
+        Exception exception = assertThrows(StorageConnectorException.class,
+                                           () -> s3StorageConnector.downloadFromStorage("s3File"));
+
+        assertEquals("Error occurred downloading from S3 Bucket", exception.getMessage());
+    }
+
+    @Test
+    void downloadFromStorage() {
+        var mockResponse = mock(GetObjectResponse.class);
+        var mockInputStream = new ByteArrayInputStream("dummy-content".getBytes());
+        var mockResponseInputStream = new ResponseInputStream<>(mockResponse, mockInputStream);
+
+        when(mockS3Client.getObject(any(GetObjectRequest.class))).thenReturn(mockResponseInputStream);
+
+        var result = s3StorageConnector.downloadFromStorage(FILE_NAME);
+
+        assertNotNull(result);
+        verify(mockS3Client).getObject(any(GetObjectRequest.class));
+    }
+}