You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/09/20 21:03:48 UTC
svn commit: r1173309 - in /tomcat/tc7.0.x/trunk: ./
test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt
Date: Tue Sep 20 19:03:48 2011
New Revision: 1173309
URL: http://svn.apache.org/viewvc?rev=1173309&view=rev
Log:
Modify test to account for behaviours of different platforms and different connectors.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 19:03:48 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,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,1173096,1173241,1173256
+/tomcat/trunk:1156171,1156276,1156304,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,1173096,1173241,1173256,1173288
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1173309&r1=1173308&r2=1173309&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Tue Sep 20 19:03:48 2011
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpSession;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -152,6 +151,8 @@ public class TestCometProcessor extends
Thread.sleep(3000);
tomcat.getConnector().stop();
+ // Allow the executor a chance to send the end event
+ Thread.sleep(100);
tomcat.getConnector().destroy();
// Wait for the write thread to stop
@@ -171,9 +172,11 @@ public class TestCometProcessor extends
// socket should be closed
assertNotNull("No exception in writing thread",
writeThread.getException());
- // Read should terminate gracefully with an EOF
- assertNull("Read thread terminated with an exception",
- readThread.getException());
+
+ // Termination of Read thread varies by platform and protocol
+ // In all cases, the END event should be sent.
+ assertTrue("Comet END event not received",
+ readThread.getResponse().contains("Client: END"));
}
private boolean isCometSupported() {
@@ -261,7 +264,6 @@ public class TestCometProcessor extends
private InputStream is;
private StringBuilder response = new StringBuilder();
- private volatile Exception e = null;
public ResponseReaderThread(InputStream is) {
this.is = is;
@@ -271,10 +273,6 @@ public class TestCometProcessor extends
return response.toString();
}
- public Exception getException() {
- return e;
- }
-
@Override
public void run() {
try {
@@ -284,7 +282,7 @@ public class TestCometProcessor extends
c = is.read();
}
} catch (Exception e) {
- this.e = e;
+ // Ignore
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org