This is an automated email from the ASF dual-hosted git repository. markt 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 2e2290fcee Fix test failures on Windows 2e2290fcee is described below commit 2e2290fcee6f4137c9b274c2f7e5d0dd27121806 Author: Mark Thomas <ma...@apache.org> 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 459af3e666..745fdcd365 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -53,6 +53,8 @@ import org.apache.tomcat.util.compat.JreCompat; public class TestGenerator extends TomcatBaseTest { + private static final String NEW_LINE = System.lineSeparator(); + @Test public void testBug45015a() throws Exception { getTomcatInstanceTestWebapp(false, true); @@ -401,38 +403,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(); } @@ -1112,38 +1114,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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org