This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 39c8f7a9c2b2ff399de3b415d4de338fdfccb713 Author: Mark Thomas <[email protected]> AuthorDate: Fri Jun 5 19:24:14 2026 +0100 Clean-up error handling in tests --- .../http11/filters/TestChunkedInputFilter.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java index cc595a31e0..7d0ed6e677 100644 --- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java +++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java @@ -161,7 +161,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { Assert.assertFalse(servlet.getExceptionDuringRead()); } else { if (processException == null) { - Assert.assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse400()); } else { // Use fall-back for checking the error occurred Assert.assertTrue(servlet.getExceptionDuringRead()); @@ -214,7 +214,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { Assert.assertEquals(7, servlet.getCountRead()); Assert.assertTrue(servlet.getExceptionDuringRead()); if (processException == null) { - Assert.assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse400()); } } @@ -324,7 +324,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { if (pass) { Assert.assertTrue(client.isResponse200()); } else { - Assert.assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse400()); } } @@ -424,7 +424,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { if (ok) { Assert.assertTrue(client.getResponseLine(), client.isResponse200()); } else { - Assert.assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse400()); } } @@ -585,7 +585,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { Assert.assertEquals(expectReadCount, servlet.getCountRead()); } else { if (processException == null) { - Assert.assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse400()); } Assert.assertEquals(0, servlet.getCountRead()); Assert.assertTrue(servlet.getExceptionDuringRead()); @@ -716,7 +716,9 @@ public class TestChunkedInputFilter extends TomcatBaseTest { exceptionDuringRead = true; if (!expectPass) { // as expected log(ioe.toString()); - resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + if (!resp.isCommitted()) { + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } return; } throw ioe; @@ -772,7 +774,9 @@ public class TestChunkedInputFilter extends TomcatBaseTest { exceptionDuringRead = true; if (!expectPass) { // as expected log(ioe.toString()); - resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + if (!resp.isCommitted()) { + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } return; } throw ioe; @@ -1216,7 +1220,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest { if (ok) { Assert.assertTrue(client.isResponse200()); } else { - Assert.assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse400()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
