Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates test to handle IOException if connection was closed #8457

Merged
merged 1 commit into from
Mar 5, 2024
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
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
* Copyright (c) 2020, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -70,21 +70,6 @@ static void setupRoute(HttpRules rules) {
});
}

/**
* If content length is greater than max, a 413 must be returned. No actual
* payload in this case.
*/
@Test
void testContentLengthExceeded() {
try (Http1ClientResponse response = client.method(Method.POST)
.path("/maxpayload")
.header(HeaderValues.CONTENT_TYPE_OCTET_STREAM)
.submit(new byte[512])) {
assertThat(response.status(), is(Status.REQUEST_ENTITY_TOO_LARGE_413));
assertThat(response.headers(), hasHeader(HeaderValues.CONNECTION_CLOSE));
}
}

/**
* If content length is greater than max, a 413 must be returned.
*/
Expand All @@ -111,10 +96,13 @@ void testActualLengthExceededWithPayload() {
.header(HeaderValues.CONTENT_TYPE_OCTET_STREAM)
.header(HeaderValues.TRANSFER_ENCODING_CHUNKED)
.outputStream(it -> {
it.write(PAYLOAD_BYTES);
it.write(PAYLOAD_BYTES);
it.write(PAYLOAD_BYTES);
it.close();
try (it) {
it.write(PAYLOAD_BYTES);
it.write(PAYLOAD_BYTES);
it.write(PAYLOAD_BYTES);
} catch (IOException e) {
// ignored -- possible connection reset
}
})) {
assertThat(response.status(), is(Status.REQUEST_ENTITY_TOO_LARGE_413));
assertThat(response.headers(), hasHeader(HeaderValues.CONNECTION_CLOSE));
Expand Down