Author: markt
Date: Fri Oct 14 20:55:42 2011
New Revision: 1183498
URL: http://svn.apache.org/viewvc?rev=1183498&view=rev
Log:
Port refactoring (r1183493) from trunk
Move the access log validation to the TesterAccessLogValve so that is is
available to all tests that use the valve.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 14 20:55:42 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1183328,1183492
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1183328,1183492-1183493
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1183498&r1=1183497&r2=1183498&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Fri Oct 14 20:55:42 2011
@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRes
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Test;
@@ -47,7 +46,6 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
-import org.apache.catalina.valves.TesterAccessLogValve.Entry;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestAsyncContextImpl extends TomcatBaseTest {
@@ -56,8 +54,6 @@ public class TestAsyncContextImpl extend
private static final long REQUEST_TIME = 1000;
// Timeout thread (where used) checks for timeout every second
private static final long TIMEOUT_MARGIN = 1000;
- // Timing tests need a small error margin to prevent failures
- private static final long ERROR_MARGIN = 10;
// Default timeout for these tests
private static final long TIMEOUT = 3000;
@@ -95,7 +91,7 @@ public class TestAsyncContextImpl extend
assertEquals("1false2true3true4true5false", servlet.getResult());
// Check the access log
- validateAccessLog(alv, 1, 200, Bug49528Servlet.THREAD_SLEEP_TIME,
+ alv.validateAccessLog(1, 200, Bug49528Servlet.THREAD_SLEEP_TIME,
Bug49528Servlet.THREAD_SLEEP_TIME + REQUEST_TIME);
}
@@ -133,7 +129,7 @@ public class TestAsyncContextImpl extend
assertEquals("1false2true3true4true5false", servlet.getResult());
// Check the access log
- validateAccessLog(alv, 1, 200, Bug49567Servlet.THREAD_SLEEP_TIME,
+ alv.validateAccessLog(1, 200, Bug49567Servlet.THREAD_SLEEP_TIME,
Bug49567Servlet.THREAD_SLEEP_TIME + REQUEST_TIME);
}
@@ -173,7 +169,7 @@ public class TestAsyncContextImpl extend
assertEquals("OK-run2", bc2.toString());
// Check the access log
- validateAccessLog(alv, 2, 200,
+ alv.validateAccessLog(2, 200,
AsyncStartNoCompleteServlet.ASYNC_TIMEOUT,
AsyncStartNoCompleteServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
REQUEST_TIME);
@@ -205,7 +201,7 @@ public class TestAsyncContextImpl extend
assertEquals("OK", bc.toString());
// Check the access log
- validateAccessLog(alv, 1, 200, 0, REQUEST_TIME);
+ alv.validateAccessLog(1, 200, 0, REQUEST_TIME);
}
/*
@@ -469,11 +465,11 @@ public class TestAsyncContextImpl extend
// Check the access log
if (completeOnTimeout && dispatchUrl != null) {
if (!isAccessLogEnabled()) {
- validateAccessLog(alv, 1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT
+
+ alv.validateAccessLog(1, 500, 0, TimeoutServlet.ASYNC_TIMEOUT +
TIMEOUT_MARGIN + REQUEST_TIME);
}
} else {
- validateAccessLog(alv, 1, 200, TimeoutServlet.ASYNC_TIMEOUT,
+ alv.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN +
REQUEST_TIME);
}
@@ -585,7 +581,7 @@ public class TestAsyncContextImpl extend
assertEquals(expected.toString(), res.toString());
// Check the access log
- validateAccessLog(alv, 1, 200, 0, REQUEST_TIME);
+ alv.validateAccessLog(1, 200, 0, REQUEST_TIME);
}
private static class DispatchingServlet extends HttpServlet {
@@ -682,7 +678,7 @@ public class TestAsyncContextImpl extend
res.toString());
// Check the access log
- validateAccessLog(alv, 1, 200, TimeoutServlet.ASYNC_TIMEOUT,
+ alv.validateAccessLog(1, 200, TimeoutServlet.ASYNC_TIMEOUT,
TimeoutServlet.ASYNC_TIMEOUT + TIMEOUT_MARGIN + REQUEST_TIME);
}
@@ -917,7 +913,7 @@ public class TestAsyncContextImpl extend
assertEquals(expected.toString(), res.toString());
// Check the access log
- validateAccessLog(alv, 1, 200, 0, REQUEST_TIME);
+ alv.validateAccessLog(1, 200, 0, REQUEST_TIME);
}
private static class ErrorServlet extends HttpServlet {
@@ -966,7 +962,7 @@ public class TestAsyncContextImpl extend
assertEquals("Runnable-onComplete-", res.toString());
// Check the access log
- validateAccessLog(alv, 1, 200, AsyncStartRunnable.THREAD_SLEEP_TIME,
+ alv.validateAccessLog(1, 200, AsyncStartRunnable.THREAD_SLEEP_TIME,
AsyncStartRunnable.THREAD_SLEEP_TIME + REQUEST_TIME);
}
@@ -1036,7 +1032,7 @@ public class TestAsyncContextImpl extend
assertEquals("xyz",testHeader.get(0));
// Check the access log
- validateAccessLog(alv, 1, 200, Bug50753Servlet.THREAD_SLEEP_TIME,
+ alv.validateAccessLog(1, 200, Bug50753Servlet.THREAD_SLEEP_TIME,
Bug50753Servlet.THREAD_SLEEP_TIME + REQUEST_TIME);
}
@@ -1102,28 +1098,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(REQUEST_TIME);
// Check the access log
- validateAccessLog(alv, 1, 500, 0, REQUEST_TIME);
- }
-
- private void validateAccessLog(TesterAccessLogValve alv, int count,
- int status, long minTime, long maxTime) throws Exception {
- List<Entry> entries = alv.getEntries();
-
- // Wait (but not too long) until all expected entries appear (access
log
- // entry will be made after response has been returned to user)
- for (int i = 0; i < 10 && entries.size() < count; i++) {
- Thread.sleep(100);
- }
-
- assertEquals(count, entries.size());
- for (int j = 0; j < count; j++) {
- Entry entry = entries.get(j);
- assertEquals(status, entry.getStatus());
- assertTrue(entry.toString(),
- entry.getTime() >= minTime - ERROR_MARGIN);
- assertTrue(entry.toString(),
- entry.getTime() < maxTime + ERROR_MARGIN);
- }
+ alv.validateAccessLog(1, 500, 0, REQUEST_TIME);
}
@Test
@@ -1162,7 +1137,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(REQUEST_TIME);
// Check the access log
- validateAccessLog(alv, 1, HttpServletResponse.SC_BAD_REQUEST, 0,
+ alv.validateAccessLog(1, HttpServletResponse.SC_BAD_REQUEST, 0,
REQUEST_TIME);
}
@@ -1223,7 +1198,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(REQUEST_TIME);
// Check the access log
- validateAccessLog(alv, 1, HttpServletResponse.SC_BAD_REQUEST, TIMEOUT,
+ alv.validateAccessLog(1, HttpServletResponse.SC_BAD_REQUEST, TIMEOUT,
TIMEOUT + TIMEOUT_MARGIN + REQUEST_TIME);
}
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=1183498&r1=1183497&r2=1183498&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
Fri Oct 14 20:55:42 2011
@@ -16,6 +16,9 @@
*/
package org.apache.catalina.valves;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +31,9 @@ import org.apache.catalina.connector.Res
public class TesterAccessLogValve extends ValveBase implements AccessLog {
+ // Timing tests need a small error margin to prevent failures
+ private static final long ERROR_MARGIN = 10;
+
private final List<Entry> entries = new ArrayList<Entry>();
public TesterAccessLogValve() {
@@ -59,8 +65,24 @@ public class TesterAccessLogValve extend
getNext().invoke(request, response);
}
- public List<Entry> getEntries() {
- return entries;
+ public void validateAccessLog(int count, int status, long minTime,
+ long maxTime) throws Exception {
+
+ // Wait (but not too long) until all expected entries appear (access
log
+ // entry will be made after response has been returned to user)
+ for (int i = 0; i < 10 && entries.size() < count; i++) {
+ Thread.sleep(100);
+ }
+
+ assertEquals(count, entries.size());
+ for (int j = 0; j < count; j++) {
+ Entry entry = entries.get(j);
+ assertEquals(status, entry.getStatus());
+ assertTrue(entry.toString(),
+ entry.getTime() >= minTime - ERROR_MARGIN);
+ assertTrue(entry.toString(),
+ entry.getTime() < maxTime + ERROR_MARGIN);
+ }
}
public static class Entry {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
