Author: kkolinko
Date: Thu Feb 6 22:08:25 2014
New Revision: 1565458
URL: http://svn.apache.org/r1565458
Log:
Merged revisions r1562458, r1565451 from tomcat/trunk:
Provide more info if test fails in access log valve check.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1562458,1565451
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1565458&r1=1565457&r2=1565458&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
Thu Feb 6 22:08:25 2014
@@ -78,9 +78,9 @@ public class TesterAccessLogValve extend
for (int j = 0; j < count; j++) {
Entry entry = entries.get(j);
assertEquals(status, entry.getStatus());
- assertTrue(entry.toString(),
+ assertTrue(entry.toString() + " duration is not >= " + (minTime -
ERROR_MARGIN),
entry.getTime() >= minTime - ERROR_MARGIN);
- assertTrue(entry.toString(),
+ assertTrue(entry.toString() + " duration is not < " + (maxTime +
ERROR_MARGIN),
entry.getTime() < maxTime + ERROR_MARGIN);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
