This is an automated email from the ASF dual-hosted git repository.
rjung 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 d3f549fe98 Fix new unit test: make expected error page size a bit
flexible
d3f549fe98 is described below
commit d3f549fe984aecfbae515c309b459f0e5e1e22a3
Author: Rainer Jung <[email protected]>
AuthorDate: Thu Apr 27 22:20:43 2023 +0200
Fix new unit test: make expected error page size a bit flexible
---
test/org/apache/catalina/valves/TestAccessLogValve.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/catalina/valves/TestAccessLogValve.java
b/test/org/apache/catalina/valves/TestAccessLogValve.java
index d6aea92f1e..5dfa4a1dbe 100644
--- a/test/org/apache/catalina/valves/TestAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestAccessLogValve.java
@@ -59,15 +59,15 @@ public class TestAccessLogValve extends TomcatBaseTest {
List<Object[]> parameterSets = new ArrayList<>();
parameterSets.add(new Object[] {"common", TEXT_TYPE, "/", "common",
- IP_PATTERN + " - - " + DATE_PATTERN + " \"GET / HTTP/1.1\" 404
700"});
+ IP_PATTERN + " - - " + DATE_PATTERN + " \"GET / HTTP/1.1\" 404
[67]\\d\\d"});
parameterSets.add(new Object[] {"common", JSON_TYPE, "/", "common",
"\\{\"host\":\"" + IP_PATTERN +
"\",\"logicalUserName\":\"-\",\"user\":\"-\",\"time\":\"" + DATE_PATTERN +
- "\",\"request\":\"GET /
HTTP/1.1\",\"statusCode\":\"404\",\"size\":\"700\"\\}"});
+ "\",\"request\":\"GET /
HTTP/1.1\",\"statusCode\":\"404\",\"size\":\"[67]\\d\\d\"\\}"});
parameterSets.add(new Object[] {"combined", TEXT_TYPE, "/", "combined",
- IP_PATTERN + " - - " + DATE_PATTERN + " \"GET / HTTP/1.1\" 404 700
\"-\" \"" + UA_PATTERN + "\""});
+ IP_PATTERN + " - - " + DATE_PATTERN + " \"GET / HTTP/1.1\" 404
[67]\\d\\d \"-\" \"" + UA_PATTERN + "\""});
parameterSets.add(new Object[] {"combined", JSON_TYPE, "/", "combined",
"\\{\"host\":\"" + IP_PATTERN +
"\",\"logicalUserName\":\"-\",\"user\":\"-\",\"time\":\"" + DATE_PATTERN +
- "\",\"request\":\"GET /
HTTP/1.1\",\"statusCode\":\"404\",\"size\":\"700\"" +
+ "\",\"request\":\"GET /
HTTP/1.1\",\"statusCode\":\"404\",\"size\":\"[67]\\d\\d\"" +
",\"requestHeaders\": \\{\"Referer\":\"-\",\"User-Agent\":\"" +
UA_PATTERN + "\"\\}\\}"});
return parameterSets;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
