Skip to content

Commit 3b11d10

Browse files
committed
test adjustment to match exactly the uploaded object
1 parent c5a4bc7 commit 3b11d10

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import software.amazon.awssdk.services.s3.S3Client;
1010
import software.amazon.awssdk.services.s3.S3Configuration;
1111
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
12+
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
1213
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
1314
import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
1415
import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
@@ -83,15 +84,17 @@ void downloadFromStorageTest() throws IOException {
8384

8485
@Test
8586
void uploadToStorageTest() throws IOException {
86-
InputStream inputStream = new ByteArrayInputStream("upload-content".getBytes(StandardCharsets.UTF_8));
87+
String uploadContent = "upload-content";
88+
InputStream inputStream = new ByteArrayInputStream(uploadContent.getBytes(StandardCharsets.UTF_8));
8789
long streamLength = inputStream.available();
8890

8991
s3StorageConnector.uploadToStorage(inputStream, streamLength, FILE_NAME);
9092

91-
HeadObjectResponse response = s3Client.headObject(HeadObjectRequest.builder().bucket(BUCKET_NAME).key(FILE_NAME).build());
93+
final var request = GetObjectRequest.builder().bucket(BUCKET_NAME).key(FILE_NAME).build();
94+
ResponseInputStream<GetObjectResponse> uploadedObjectInS3 = s3Client.getObject(request);
95+
String uploadedS3Content = new String(uploadedObjectInS3.readAllBytes(), StandardCharsets.UTF_8);
9296

93-
assertNotNull(response);
94-
assertEquals(Optional.of(streamLength).get(), response.contentLength());
97+
assertEquals(uploadContent, uploadedS3Content);
9598
}
9699

97100
}

0 commit comments

Comments
 (0)