You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/06/24 21:55:45 UTC

(tomcat) branch 9.0.x updated: Fix Windows test failures

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 0387e40bd7 Fix Windows test failures
0387e40bd7 is described below

commit 0387e40bd7160bf40efc45b588bd8967f39b000a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 24 22:49:32 2026 +0100

    Fix Windows test failures
---
 test/org/apache/jasper/compiler/TestGenerator.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index 131fe1c2b4..f0754bca34 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -1261,9 +1261,9 @@ public class TestGenerator extends TomcatBaseTest {
     public void testTagReuseException01() throws Exception {
         TesterExceptionTag.resetForNewTest();
         // No exceptions. Check re-use.
-        doTestTagReuseException(null, "start-1\nend-1\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-1" + NEW_LINE + "end-1" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(1));
-        doTestTagReuseException(null, "start-1\nend-1\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-1" + NEW_LINE + "end-1" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(1));
     }
 
@@ -1271,14 +1271,14 @@ public class TestGenerator extends TomcatBaseTest {
     public void testTagReuseException02() throws Exception {
         TesterExceptionTag.resetForNewTest();
         // Exception on doStartTag
-        doTestTagReuseException(null, "start-1\nend-1\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-1" + NEW_LINE + "end-1" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(1));
         doTestTagReuseException("throwOnStart=true", null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         Assert.assertTrue(TesterExceptionTag.isReleased(1));
         // Should use new instance
-        doTestTagReuseException(null, "start-2\nend-2\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-2" + NEW_LINE + "end-2" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(2));
-        doTestTagReuseException(null, "start-2\nend-2\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-2" + NEW_LINE + "end-2" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(2));
     }
 
@@ -1286,14 +1286,14 @@ public class TestGenerator extends TomcatBaseTest {
     public void testTagReuseException03() throws Exception {
         TesterExceptionTag.resetForNewTest();
         // Exception on doEndTag
-        doTestTagReuseException(null, "start-1\nend-1\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-1" + NEW_LINE + "end-1" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(1));
         doTestTagReuseException("throwOnEnd=true", null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         Assert.assertTrue(TesterExceptionTag.isReleased(1));
         // Should use new instance
-        doTestTagReuseException(null, "start-2\nend-2\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-2" + NEW_LINE + "end-2" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(2));
-        doTestTagReuseException(null, "start-2\nend-2\n", HttpServletResponse.SC_OK);
+        doTestTagReuseException(null, "start-2" + NEW_LINE + "end-2" + NEW_LINE + "", HttpServletResponse.SC_OK);
         Assert.assertFalse(TesterExceptionTag.isReleased(2));
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org