Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ public class ResponsePublisherTimeoutIntegrationTest extends S3IntegrationTestBa

private static final String BUCKET = temporaryBucketName(GetObjectIntegrationTest.class);
private static final String KEY = "TestKey";
private static final String CONTENT = "Hello";
// Large enough to trigger StreamedHttpResponse instead of FullHttpResponse in Netty.
// FullHttpResponse releases the connection immediately, defeating pool-exhaustion tests.
private static final int CONTENT_LENGTH = 2 * 1024 * 1024;
private static final GetObjectRequest getObjectRequest = GetObjectRequest.builder()
.bucket(BUCKET)
.key(KEY)
Expand All @@ -61,7 +63,7 @@ public static void setupFixture() throws IOException {
s3.putObject(PutObjectRequest.builder()
.bucket(BUCKET)
.key(KEY)
.build(), RequestBody.fromString(CONTENT));
.build(), RequestBody.fromBytes(new byte[CONTENT_LENGTH]));
}

@AfterClass
Expand All @@ -87,7 +89,7 @@ public void defaultTimeout_firstPublisherConsumed_secondRequestSucceeds() {
CompletableFuture<ResponsePublisher<GetObjectResponse>> get2 = getObjectWithDefaultTimeoutPublisher();

GetObjectResponse getObjectResponse = get2.join().response();
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT.length());
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT_LENGTH);
}

@Test
Expand All @@ -97,7 +99,7 @@ public void defaultTimeout_cancelFirstRequestFuture_secondRequestSucceeds() {
CompletableFuture<ResponsePublisher<GetObjectResponse>> get2 = getObjectWithDefaultTimeoutPublisher();

GetObjectResponse getObjectResponse = get2.join().response();
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT.length());
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT_LENGTH);
}

@Test
Expand All @@ -107,7 +109,7 @@ public void customTimeout_waitForTimeout_secondRequestSucceeds() throws Interrup
CompletableFuture<ResponsePublisher<GetObjectResponse>> get2 = getObjectWithDefaultTimeoutPublisher();

GetObjectResponse getObjectResponse = get2.join().response();
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT.length());
assertThat(getObjectResponse.contentLength()).isEqualTo(CONTENT_LENGTH);
}

private CompletableFuture<ResponsePublisher<GetObjectResponse>> getObjectWithDefaultTimeoutPublisher() {
Expand Down
Loading