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
commit 9cf742b7dfc74b9cfd82e041736d7509fe7faacf Author: Mark Thomas <[email protected]> AuthorDate: Thu Oct 21 10:28:30 2021 +0100 Fix test. Source files are declared as having ISO-8859-1 encoding --- .../apache/catalina/connector/TestCoyoteAdapterCanonicalization.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/org/apache/catalina/connector/TestCoyoteAdapterCanonicalization.java b/test/org/apache/catalina/connector/TestCoyoteAdapterCanonicalization.java index 710e0c7..d633b2e 100644 --- a/test/org/apache/catalina/connector/TestCoyoteAdapterCanonicalization.java +++ b/test/org/apache/catalina/connector/TestCoyoteAdapterCanonicalization.java @@ -99,7 +99,7 @@ public class TestCoyoteAdapterCanonicalization extends TomcatBaseTest { parameterSets.add(new Object[] { "/;/foo;/;/bar/;/;", "/foo/bar/", Boolean.TRUE, Boolean.FALSE }); parameterSets.add(new Object[] { "/foo//../bar", "/bar", Boolean.FALSE, Boolean.FALSE }); parameterSets.add(new Object[] { "/foo/;/../bar", "/bar", Boolean.TRUE, Boolean.FALSE }); - parameterSets.add(new Object[] { "/foo%E2%82%ACbar", "/foo€bar", Boolean.FALSE, Boolean.FALSE }); + parameterSets.add(new Object[] { "/foo%E2%82%ACbar", "/foo\u20acbar", Boolean.FALSE, Boolean.FALSE }); parameterSets.add(new Object[] { "/foo%20bar", "/foo bar", Boolean.FALSE, Boolean.FALSE }); parameterSets.add(new Object[] { "/foo%E2%82", "/foo%E2%82", Boolean.TRUE, Boolean.TRUE }); parameterSets.add(new Object[] { "/foo%E2%82bar", "/foo%E2%82bar", Boolean.TRUE, Boolean.TRUE }); @@ -197,7 +197,7 @@ public class TestCoyoteAdapterCanonicalization extends TomcatBaseTest { Assert.assertTrue(line + CRLF + body, line.startsWith("HTTP/1.1 " + HttpServletResponse.SC_BAD_REQUEST)); } else { Assert.assertTrue(line + CRLF + body, line.startsWith("HTTP/1.1 " + HttpServletResponse.SC_OK)); - Assert.assertTrue(line + CRLF + body, body.equals(canonicalizedURI)); + Assert.assertEquals(line + CRLF + body, canonicalizedURI, body); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
