(tomcat) branch 11.0.x updated: Clean-up error handling in tests

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new d7bcbf6a7e Clean-up error handling in tests
d7bcbf6a7e is described below

commit d7bcbf6a7e2f7b019bee4d581a8a91ede136515d
Author: Mark Thomas <ma...@apache.org>
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 54f569cd64..fc70525f51 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -160,7 +160,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());
@@ -213,7 +213,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());
         }
     }
 
@@ -323,7 +323,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
         if (pass) {
             Assert.assertTrue(client.isResponse200());
         } else {
-            Assert.assertTrue(client.isResponse500());
+            Assert.assertTrue(client.isResponse400());
         }
     }
 
@@ -423,7 +423,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());
         }
     }
 
@@ -584,7 +584,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());
@@ -715,7 +715,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;
@@ -771,7 +773,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;
@@ -1215,7 +1219,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org