increasing test coverage

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStore.java

@@ -31,6 +31,10 @@ public class CustomTrustStore {
     @Autowired(required = false)
     private S3Client s3Client;
 
+    public void setS3Client(S3Client s3Client) {
+        this.s3Client = s3Client;
+    }
+
     @SneakyThrows
     public void addToDefault(String trustStorePath, String trustStorePassword) {
         final X509TrustManager defaultTrustManager = getDefaultTrustManager();
@@ -59,7 +63,7 @@ private X509TrustManager getDefaultTrustManager() {
 
     @SneakyThrows
     @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
-    private X509TrustManager getCustomDbTrustManager(S3Uri s3Uri, String trustStorePassword) {
+    protected X509TrustManager getCustomDbTrustManager(S3Uri s3Uri, String trustStorePassword) {
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         trustManagerFactory.init((KeyStore) null);
 

service/src/test/java/uk/nhs/adaptors/gp2gp/common/configuration/CustomTrustStoreTest.java

@@ -0,0 +1,67 @@
+package uk.nhs.adaptors.gp2gp.common.configuration;
+
+import io.findify.s3mock.S3Mock;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+import java.io.File;
+import java.net.URI;
+
+import static org.junit.jupiter.api.Assertions.*;
+class CustomTrustStoreTest {
+
+    public static final int PORT = 8001;
+    private static S3Mock s3Mock;
+    private static S3Client s3Client;
+    private static final String BUCKET_NAME = "test-bucket";
+    private static final String TRUSTSTORE_PATH = "test.jks";
+    private static final String TRUSTSTORE_PASSWORD = "password";
+
+    private final CustomTrustStore customTrustStore = new CustomTrustStore();
+
+    @BeforeAll
+    static void setUp() {
+        s3Mock = new S3Mock.Builder().withPort(PORT).withInMemoryBackend().build();
+        s3Mock.start();
+        System.out.println("S3Mock started at http://localhost:" + PORT);
+
+        s3Client = S3Client.builder()
+            .endpointOverride(URI.create("http://localhost:" + PORT))
+            .credentialsProvider(StaticCredentialsProvider.create(
+                AwsBasicCredentials.create("accessKey", "secretKey")))
+            .region(Region.US_EAST_1)
+            .serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build())
+            .build();
+
+        s3Client.createBucket(CreateBucketRequest.builder().bucket(BUCKET_NAME).build());
+
+        File trustStoreFile = new File("src/test/resources/test.jks");
+        s3Client.putObject(PutObjectRequest.builder().bucket(BUCKET_NAME).key(TRUSTSTORE_PATH).build(),
+                           software.amazon.awssdk.core.sync.RequestBody.fromFile(trustStoreFile));
+    }
+
+    @AfterAll
+    static void tearDown() {
+        s3Mock.shutdown();
+    }
+
+    @Test
+    void trustManagerLoadsSuccessfullyTest() {
+
+        customTrustStore.setS3Client(s3Client);
+
+        String s3Uri = "s3://" + BUCKET_NAME + "/" + TRUSTSTORE_PATH;
+
+        var trustManager = customTrustStore.getCustomDbTrustManager(s3Client.utilities().parseUri(URI.create(s3Uri)), TRUSTSTORE_PASSWORD);
+
+        assertNotNull(trustManager, "Custom TrustManager wasn't loaded successfully!");
+    }
+}

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

@@ -5,15 +5,22 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 
 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.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -22,9 +29,14 @@ class S3StorageConnectorTest {
     private static final String FILE_NAME = "test-file.txt";
     private S3StorageConnector s3StorageConnector;
     private StorageConnectorConfiguration config;
+    private static final long STREAM_LENGTH = 100L;
+
     @Mock
     private S3Client mockS3Client;
 
+    @Mock
+    private InputStream is;
+
     @BeforeEach
     void setUp() {
         MockitoAnnotations.openMocks(this);
@@ -46,7 +58,7 @@ void expectExceptionWhenS3ClientCantDeliverResponse() {
     }
 
     @Test
-    void downloadFromStorage() {
+    void downloadFromStorageTest() {
         var mockResponse = mock(GetObjectResponse.class);
         var mockInputStream = new ByteArrayInputStream("dummy-content".getBytes());
         var mockResponseInputStream = new ResponseInputStream<>(mockResponse, mockInputStream);
@@ -59,4 +71,14 @@ void downloadFromStorage() {
         assertNotNull(result);
         verify(mockS3Client).getObject(request);
     }
+
+    @Test
+    void uploadToStorageTest() {
+        final var expectedRequest = PutObjectRequest.builder().bucket(config.getContainerName()).key(FILE_NAME).build();
+
+        s3StorageConnector.uploadToStorage(is, STREAM_LENGTH, FILE_NAME);
+
+        verify(mockS3Client, times(1)).putObject(eq(expectedRequest), any(RequestBody.class));
+    }
+
 }

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

@@ -0,0 +1,24 @@
+package uk.nhs.adaptors.gp2gp.common.storage;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StorageConnectorConfigurationTest {
+
+    private StorageConnectorConfiguration configuration;
+
+    @BeforeEach
+    void setUp() {
+        configuration = new StorageConnectorConfiguration();
+        configuration.setTrustStoreUrl("s3://my-trust-store");
+    }
+
+    @Test
+    void expectToReturnS3ClientTest() {
+        var s3Client = configuration.getS3Client();
+
+        assertNotNull(s3Client);
+    }
+}