cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp DataSenderTest.java
pero2005/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 ChangesPath
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 - 1.2
+++ DataSenderTest.java 16 Apr 2005 07:06:08 - 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/tcp DataSenderTest.java ReplicationValveTest.java
pero2005/04/03 09:03:01 Modified:modules/cluster build.xml modules/cluster/src/share/org/apache/catalina/cluster ClusterSender.java modules/cluster/src/share/org/apache/catalina/cluster/session JvmRouteBinderValve.java modules/cluster/src/share/org/apache/catalina/cluster/tcp DataSender.java Jdk13ReplicationListener.java LocalStrings.properties ReplicationTransmitter.java ReplicationValve.java SimpleTcpCluster.java TcpReplicationThread.java mbeans-descriptors.xml Added: modules/cluster/src/share/org/apache/catalina/cluster/tcp SendMessageData.java modules/cluster/test build.xml modules/cluster/test/conf log4j.xml modules/cluster/test/src/share/org/apache/catalina/cluster/tcp DataSenderTest.java ReplicationValveTest.java Log: refactor something, see changelog 5.5.10 Revision ChangesPath 1.14 +10 -8 jakarta-tomcat-catalina/modules/cluster/build.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/build.xml.diff?r1=1.13&r2=1.14 1.5 +3 -1 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterSender.java.diff?r1=1.4&r2=1.5 1.5 +61 -65 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java.diff?r1=1.4&r2=1.5 1.5 +189 -62 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java.diff?r1=1.4&r2=1.5 1.6 +77 -14 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Jdk13ReplicationListener.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Jdk13ReplicationListener.java.diff?r1=1.5&r2=1.6 1.5 +18 -5 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties.diff?r1=1.4&r2=1.5 1.23 +59 -1 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java.diff?r1=1.22&r2=1.23 1.19 +248 -155 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java.diff?r1=1.18&r2=1.19 1.60 +181 -71 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java.diff?r1=1.59&r2=1.60 1.15 +2 -2 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/TcpReplicationThread.java.diff?r1=1.14&r2=1.15 1.6 +33 -1 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml.diff?r1=1.5&r2=1.6 1.1 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SendMessageData.java?rev=1.1 1.1 jakarta-tomcat-catalina/modules/cluster/test/build.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/test/build.xml?rev=1.1 1.1 jakarta-tomcat-catalina/modules/cluster/test/conf/log4j.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/test/conf/log4j.xml?rev=1.1 1.1 jakarta-tomcat-catalina/modules/cluster/test/src
