This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 12411fb46b Fix Windows test failures
12411fb46b is described below
commit 12411fb46bfabc5d4795c580de929db0320df8cf
Author: Mark Thomas <[email protected]>
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 e518d7ca55..69fd086637 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -1281,9 +1281,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));
}
@@ -1291,14 +1291,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));
}
@@ -1306,14 +1306,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: [email protected]
For additional commands, e-mail: [email protected]
