From 6bd067cb5a9de07b3748d65b870ddf2615caef90 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 8 Aug 2023 11:44:22 +0200 Subject: [PATCH] Suppressed exceptions during testing. Signed-off-by: Simone Bordet --- .../client/transport/EventsHandlerTest.java | 84 ++++++++++--------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java index 5c4392d6f223..8be557d400bf 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/EventsHandlerTest.java @@ -28,6 +28,7 @@ import org.eclipse.jetty.client.StringRequestContent; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.io.Content; +import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; @@ -54,55 +55,58 @@ public class EventsHandlerTest extends AbstractTest @MethodSource("transports") public void testEventsBufferAndChunkAreReadOnly(Transport transport) throws Exception { - List onRequestReadExceptions = new CopyOnWriteArrayList<>(); - List onResponseWriteExceptions = new CopyOnWriteArrayList<>(); - EventsHandler eventsHandler = new EventsHandler(new EchoHandler()) + try (StacklessLogging ignored = new StacklessLogging(EventsHandler.class)) { - @Override - protected void onRequestRead(Request request, Content.Chunk chunk) + List onRequestReadExceptions = new CopyOnWriteArrayList<>(); + List onResponseWriteExceptions = new CopyOnWriteArrayList<>(); + EventsHandler eventsHandler = new EventsHandler(new EchoHandler()) { - try + @Override + protected void onRequestRead(Request request, Content.Chunk chunk) { - if (chunk != null) + try { - chunk.getByteBuffer().put((byte)0); + if (chunk != null) + { + chunk.getByteBuffer().put((byte)0); + } } + catch (ReadOnlyBufferException e) + { + onRequestReadExceptions.add(e); + throw e; + } + if (chunk != null) + chunk.skip(chunk.remaining()); } - catch (ReadOnlyBufferException e) - { - onRequestReadExceptions.add(e); - throw e; - } - if (chunk != null) - chunk.skip(chunk.remaining()); - } - @Override - protected void onResponseWrite(Request request, boolean last, ByteBuffer content) - { - try - { - if (content != null) - content.put((byte)0); - } - catch (ReadOnlyBufferException e) + @Override + protected void onResponseWrite(Request request, boolean last, ByteBuffer content) { - onResponseWriteExceptions.add(e); - throw e; + try + { + if (content != null) + content.put((byte)0); + } + catch (ReadOnlyBufferException e) + { + onResponseWriteExceptions.add(e); + throw e; + } } - } - }; - startServer(transport, eventsHandler); - startClient(transport); - - ContentResponse response = client.POST(newURI(transport)) - .body(new StringRequestContent("ABCDEF")) - .send(); - - assertThat(response.getStatus(), is(200)); - assertThat(response.getContentAsString(), is("ABCDEF")); - assertThat(onRequestReadExceptions.size(), greaterThan(0)); - assertThat(onResponseWriteExceptions.size(), greaterThan(0)); + }; + startServer(transport, eventsHandler); + startClient(transport); + + ContentResponse response = client.POST(newURI(transport)) + .body(new StringRequestContent("ABCDEF")) + .send(); + + assertThat(response.getStatus(), is(200)); + assertThat(response.getContentAsString(), is("ABCDEF")); + assertThat(onRequestReadExceptions.size(), greaterThan(0)); + assertThat(onResponseWriteExceptions.size(), greaterThan(0)); + } } @ParameterizedTest