This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 07b8812 Align with 8.5.x. Remove temp debug code. Improve failure
logging.
07b8812 is described below
commit 07b8812f52c76d56a5ca4e523bdeabbe7912c09e
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 30 22:24:38 2019 +0100
Align with 8.5.x. Remove temp debug code. Improve failure logging.
---
test/org/apache/catalina/valves/TesterAccessLogValve.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/valves/TesterAccessLogValve.java
b/test/org/apache/catalina/valves/TesterAccessLogValve.java
index 050ab10..838de8f 100644
--- a/test/org/apache/catalina/valves/TesterAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TesterAccessLogValve.java
@@ -44,7 +44,6 @@ public class TesterAccessLogValve extends ValveBase
implements AccessLog {
@Override
public void log(Request request, Response response, long time) {
- (new Exception("Do log")).printStackTrace();
entries.add(new Entry(request.getRequestURI(), response.getStatus(),
time));
}
@@ -76,7 +75,12 @@ public class TesterAccessLogValve extends ValveBase
implements AccessLog {
Thread.sleep(100);
}
- Assert.assertEquals(count, entries.size());
+ StringBuilder entriesLog = new StringBuilder();
+ for (Entry entry : entries) {
+ entriesLog.append(entry.toString());
+ entriesLog.append(System.getProperty("line.separator"));
+ }
+ Assert.assertEquals(entriesLog.toString(), count, entries.size());
for (Entry entry : entries) {
Assert.assertEquals(status, entry.getStatus());
Assert.assertTrue(entry.toString() + " duration is not >= " +
(minTime - ERROR_MARGIN),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
