You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2005/04/16 09:06:08 UTC
cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp DataSenderTest.java
pero 2005/04/16 00:06:08
Modified: modules/cluster/test/src/share/org/apache/catalina/cluster/tcp
DataSenderTest.java
Log:
Correct checkKeepAlive
New WriteData send also the header
Revision Changes Path
1.3 +9 -9 jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java
Index: DataSenderTest.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp/DataSenderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSenderTest.java 10 Apr 2005 16:20:46 -0000 1.2
+++ DataSenderTest.java 16 Apr 2005 07:06:08 -0000 1.3
@@ -132,7 +132,7 @@
DataSender sender = createMockDataSender();
sender.writeData(new byte[]{ 1,2,3 }) ;
ByteArrayOutputStream stream = (ByteArrayOutputStream)sender.getSocket().getOutputStream();
- assertEquals(3,stream.size());
+ assertEquals(21,stream.size());
ByteArrayInputStream istream = (ByteArrayInputStream)sender.getSocket().getInputStream();
assertEquals(-1,istream.read());
MockSocket socket =((MockSocket)sender.getSocket());
@@ -163,7 +163,7 @@
sender.openSocket();
sender.writeData(new byte[]{ 1,2,3 }) ;
ByteArrayOutputStream stream = (ByteArrayOutputStream)sender.getSocket().getOutputStream();
- assertEquals(3,stream.size());
+ assertEquals(21,stream.size());
ByteArrayInputStream istream = (ByteArrayInputStream)sender.getSocket().getInputStream();
assertEquals(3,TcpReplicationThread.ACK_COMMAND.length);
assertEquals(TcpReplicationThread.ACK_COMMAND[0],istream.read());
@@ -175,23 +175,23 @@
* Check close socket fro keep alive handling is correct (number of request and timeout
* @throws Exception
*/
- public void testCheckIfCloseSocket() throws Exception {
+ public void testcheckKeepAlive() throws Exception {
DataSender sender = createMockDataSender() ;
- assertFalse(sender.checkIfCloseSocket()) ;
+ assertFalse(sender.checkKeepAlive()) ;
sender.setKeepAliveMaxRequestCount(1);
sender.keepAliveCount = 1;
- assertTrue(sender.checkIfCloseSocket());
+ assertTrue(sender.checkKeepAlive());
assertEquals(1,sender.getSocketCloseCounter());
assertEquals(0,sender.getKeepAliveCount());
sender.openSocket();
assertEquals(0,sender.getKeepAliveCount());
sender.setKeepAliveMaxRequestCount(100);
sender.keepAliveConnectTime = System.currentTimeMillis() - sender.getKeepAliveTimeout() ;
- assertFalse(sender.checkIfCloseSocket());
+ assertFalse(sender.checkKeepAlive());
assertTrue(sender.isConnected());
assertEquals(1,sender.getSocketCloseCounter());
sender.keepAliveConnectTime-- ;
- assertTrue(sender.checkIfCloseSocket());
+ assertTrue(sender.checkKeepAlive());
assertEquals(2,sender.getSocketCloseCounter());
}
@@ -233,7 +233,7 @@
*/
private void assertPushMessage(DataSender sender) throws IOException {
ByteArrayOutputStream stream = pushMessage(sender);
- assertEquals(3,stream.size());
+ assertEquals(21,stream.size());
assertEquals(1,sender.getKeepAliveCount());
assertEquals(1,sender.getNrOfRequests());
assertEquals(0,sender.getProcessingTime());
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org