Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x

This commit is contained in:
gregw 2024-09-02 08:23:58 +10:00
parent b4232317c7 3d5a58a1f4
commit 895944920b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/LargeHeaderTest.java
View File

@ -50,6 +50,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class LargeHeaderTest
{
@ -81,7 +82,7 @@ public class LargeHeaderTest
}
@Override
public boolean handle(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback)
{
String idCount = request.getHeaders().get("X-Count");
LOG.debug("X-Count: {} [handle]", idCount);
@ -255,8 +256,11 @@ public class LargeHeaderTest
throw issues;
}
for (Future<Void> future : futures)
future.get(2, TimeUnit.SECONDS);
executorService.shutdown();
executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS);
assertTrue(executorService.awaitTermination(timeout * 2, TimeUnit.SECONDS));
assertEquals(iterations, count500.get(), () ->
{
return """
@ -307,12 +311,7 @@ public class LargeHeaderTest
}
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
int status = response.getStatus();
if (response == null)
{
LOG.warn("X-Count: {} - Empty Parsed Response", count);
countEmpty.incrementAndGet();
}
else if (status == 500)
if (status == 500)
{
long contentLength = response.getLongField(HttpHeader.CONTENT_LENGTH);
String responseBody = response.getContent();
@ -336,15 +335,13 @@ public class LargeHeaderTest
}
assertEquals(iterations, count500.get(), () ->
{
return """
"""
All tasks did not fail as expected.
Iterations: %d
Count (500 response status) [expected]: %d
Count (empty responses): %d
Count (throwables): %d
Count (other status codes): %d
""".formatted(iterations, count500.get(), countEmpty.get(), countFailure.get(), countOther.get());
});
""".formatted(iterations, count500.get(), countEmpty.get(), countFailure.get(), countOther.get()));
}
}