This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 5696220027 Fix test failures on Windows
5696220027 is described below
commit 569622002718248c4eb6fc06a891457c36947426
Author: Mark Thomas <[email protected]>
AuthorDate: Wed May 7 11:49:20 2025 +0100
Fix test failures on Windows
---
test/org/apache/jasper/compiler/TestGenerator.java | 82 +++++++++++-----------
1 file changed, 42 insertions(+), 40 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java
b/test/org/apache/jasper/compiler/TestGenerator.java
index 7badf68bb2..b098bf983d 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -52,6 +52,8 @@ import org.apache.tomcat.util.buf.ByteChunk;
public class TestGenerator extends TomcatBaseTest {
+ private static final String NEW_LINE = System.lineSeparator();
+
@Test
public void testBug45015a() throws Exception {
getTomcatInstanceTestWebapp(false, true);
@@ -400,38 +402,38 @@ public class TestGenerator extends TomcatBaseTest {
// This should break all subsequent requests
ByteChunk body = new ByteChunk();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/set-01.jsp", body, null);
- Assert.assertEquals("\n\n\n"
- + "pageContext value=testValue\n"
- + "request value=null\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=testValue" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/set-02.jsp", body, null);
- Assert.assertEquals("\n\n\n"
- + "pageContext value=testValue\n"
- + "request value=null\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=testValue" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/set-03.jsp", body, null);
- Assert.assertEquals("\n\n\n"
- + "pageContext value=null\n"
- + "request value=testValue\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=null" + NEW_LINE
+ + "request value=testValue" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/set-04.jsp", body, null);
- Assert.assertEquals("\n\n\n"
- + "pageContext value=null\n"
- + "request value=null\n"
- + "session value=testValue\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=null" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=testValue" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/set-05.jsp", body, null);
- Assert.assertEquals("\n\n\n"
- + "pageContext value=null\n"
- + "request value=null\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=null" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=testValue", body.toString());
body.recycle();
}
@@ -1097,38 +1099,38 @@ public class TestGenerator extends TomcatBaseTest {
// This should break all subsequent requests
ByteChunk body = new ByteChunk();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/remove-01.jsp", body, null);
- Assert.assertEquals("\n\n\n\n\n\n\n"
- + "pageContext value=null\n"
- + "request value=testValue\n"
- + "session value=testValue\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE + NEW_LINE +
NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=null" + NEW_LINE
+ + "request value=testValue" + NEW_LINE
+ + "session value=testValue" + NEW_LINE
+ "application value=testValue", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/remove-02.jsp", body, null);
- Assert.assertEquals("\n\n\n\n\n\n\n"
- + "pageContext value=testValue\n"
- + "request value=null\n"
- + "session value=testValue\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE + NEW_LINE +
NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=testValue" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=testValue" + NEW_LINE
+ "application value=testValue", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/remove-03.jsp", body, null);
- Assert.assertEquals("\n\n\n\n\n\n\n"
- + "pageContext value=testValue\n"
- + "request value=testValue\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE + NEW_LINE +
NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=testValue" + NEW_LINE
+ + "request value=testValue" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=testValue", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/remove-04.jsp", body, null);
- Assert.assertEquals("\n\n\n\n\n\n\n"
- + "pageContext value=testValue\n"
- + "request value=testValue\n"
- + "session value=testValue\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE + NEW_LINE +
NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=testValue" + NEW_LINE
+ + "request value=testValue" + NEW_LINE
+ + "session value=testValue" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/nonstandard/remove-05.jsp", body, null);
- Assert.assertEquals("\n\n\n\n\n\n\n"
- + "pageContext value=null\n"
- + "request value=null\n"
- + "session value=null\n"
+ Assert.assertEquals(NEW_LINE + NEW_LINE + NEW_LINE + NEW_LINE +
NEW_LINE + NEW_LINE + NEW_LINE
+ + "pageContext value=null" + NEW_LINE
+ + "request value=null" + NEW_LINE
+ + "session value=null" + NEW_LINE
+ "application value=null", body.toString());
body.recycle();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
