Skip to content

Commit

Permalink
#690: Use BaseTest to generate test paths for S3OutputStreamTest
Browse files Browse the repository at this point in the history
  • Loading branch information
@steve-todorov
steve-todorov committed May 25, 2023
1 parent 3e8927f commit eb28b00
Showing 1 changed file with 26 additions and 44 deletions.
70 changes: 26 additions & 44 deletions src/test/java/org/carlspring/cloud/storage/s3fs/S3OutputStreamTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,7 @@

import org.carlspring.cloud.storage.s3fs.util.S3ClientMock;
import org.carlspring.cloud.storage.s3fs.util.S3MockFactory;

import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
Expand All @@ -28,28 +14,25 @@
import software.amazon.awssdk.core.exception.SdkException;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.http.Header;
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;
import software.amazon.awssdk.services.s3.model.*;

import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static java.util.UUID.randomUUID;
import static org.carlspring.cloud.storage.s3fs.S3OutputStream.MAX_ALLOWED_UPLOAD_PARTS;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;

@ExtendWith(MockitoExtension.class)
class S3OutputStreamTest
class S3OutputStreamTest extends BaseTest
{

private static final String BUCKET_NAME = "s3OutputStreamTest";
Expand All @@ -60,8 +43,6 @@ class S3OutputStreamTest
@Captor
private ArgumentCaptor<RequestBody> requestBodyCaptor;

private String key;

private static Stream<Arguments> offsetAndLengthForWriteProvider()
{
return Stream.of(
Expand All @@ -73,20 +54,13 @@ private static Stream<Arguments> offsetAndLengthForWriteProvider()
);
}

@BeforeEach
void init(final TestInfo testInfo)
{
final Optional<Method> method = testInfo.getTestMethod();
key = method.map(Method::getName).orElseThrow(() -> new IllegalStateException("No method name ?"));
}

@Test
void openAndCloseProducesEmptyObject()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();

final S3ObjectId objectId = S3ObjectId.builder()
.bucket(BUCKET_NAME)
.key(key)
Expand All @@ -107,8 +81,8 @@ void zeroBytesWrittenProduceEmptyObject()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();

final S3ObjectId objectId = S3ObjectId.builder()
.bucket(BUCKET_NAME)
.key(key)
Expand All @@ -131,8 +105,8 @@ void invalidValuesForOffsetAndLengthProducesIndexOutOfBoundsException(final int
final int length)
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();

final S3ObjectId objectId = S3ObjectId.builder()
.bucket(BUCKET_NAME)
.key(key)
Expand All @@ -155,6 +129,7 @@ void closeAndWriteProducesIOException()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -187,6 +162,7 @@ void maxNumberOfUploadPartsReachedProducesIOException()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -219,6 +195,7 @@ void smallDataUsesPutObject()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand All @@ -243,6 +220,7 @@ void bigDataUsesMultipartUpload()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -272,6 +250,7 @@ void whenCreateMultipartUploadFailsThenAnExceptionIsThrown()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -311,6 +290,7 @@ void whenCreateMultipartUploadReturnsNullUploadIdThenAnExceptionIsThrown()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -352,6 +332,7 @@ void whenUploadPartFailsThenAnExceptionIsThrown()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down Expand Up @@ -386,6 +367,7 @@ void whenUploadPartAndAbortMultipartFailsThenAnExceptionIsThrown()
throws IOException
{
//given
final String key = getTestBasePath() + "/" + randomUUID();
final S3ClientMock client = S3MockFactory.getS3ClientMock();
client.bucket(BUCKET_NAME).file(key);

Expand Down

0 comments on commit eb28b00

Please sign in to comment.