[jboss-cvs] JBoss Messaging SVN: r4238 - in trunk/tests/src/org/jboss/messaging/tests: unit/core/remoting and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 19 11:53:53 EDT 2008
Author: jmesnil
Date: 2008-05-19 11:53:53 -0400 (Mon, 19 May 2008)
New Revision: 4238
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java
Removed:
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
Log:
replaced use of Ping by ConnectionCreateSessionResponseMessage as the packet to send to avoid interference with keepalive mechanism
Copied: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java (from rev 4234, trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/Handler.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.tests.integration.core.remoting.mina;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static junit.framework.Assert.fail;
+
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
+import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public class Handler extends TestPacketHandler
+{
+ // Constants -----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(Handler.class);
+
+
+ // Attributes ----------------------------------------------------
+
+ private int sleepTime;
+ private TimeUnit timeUnit;
+ private PacketReturner lastSender;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ public Handler(final long id)
+ {
+ super(id);
+ }
+
+ // Public --------------------------------------------------------
+
+ public void setSleepTime(int sleepTime, TimeUnit timeUnit)
+ {
+ this.sleepTime = sleepTime;
+ this.timeUnit = timeUnit;
+ }
+
+ public PacketReturner getLastSender()
+ {
+ return lastSender;
+ }
+
+ // TestPacketHandler overrides -----------------------------------
+
+ protected boolean isRequest(final Packet packet)
+ {
+ return packet.getTargetID() != EmptyPacket.NO_ID_SET && packet.getResponseTargetID() != EmptyPacket.NO_ID_SET;
+ }
+
+ @Override
+ protected void doHandle(Packet packet, PacketReturner sender)
+ {
+ Assert.assertTrue(packet instanceof ConnectionCreateSessionResponseMessage);
+
+ lastSender = sender;
+
+ if (sleepTime > 0)
+ {
+ try
+ {
+ Thread.sleep(MILLISECONDS.convert(sleepTime, timeUnit));
+ } catch (InterruptedException e)
+ {
+ fail();
+ }
+ }
+
+ ConnectionCreateSessionResponseMessage message = (ConnectionCreateSessionResponseMessage) packet;
+ if (isRequest(message))
+ {
+ Pong response = new Pong(message.getSessionID(), true);
+ response.normalize(message);
+ try
+ {
+ sender.send(response);
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to handle", e);
+ }
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java 2008-05-19 13:39:11 UTC (rev 4237)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -21,6 +21,7 @@
import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaHandler;
+import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
@@ -61,7 +62,7 @@
handler_1.expectMessage(2);
handler_2.expectMessage(MANY_MESSAGES);
- Ping packet_1 = new Ping(randomLong());
+ ConnectionCreateSessionResponseMessage packet_1 = new ConnectionCreateSessionResponseMessage(randomLong());
packet_1.setTargetID(handler_1.getID());
packet_1.setExecutorID(handler_1.getID());
@@ -71,7 +72,7 @@
handler.messageReceived(null, packet_1);
for (int i = 0; i < MANY_MESSAGES; i++)
{
- Ping packet_2 = new Ping(i);
+ ConnectionCreateSessionResponseMessage packet_2 = new ConnectionCreateSessionResponseMessage(i);
packet_2.setTargetID(handler_2.getID());
packet_2.setExecutorID(handler_2.getID());
handler.messageReceived(null, packet_2);
@@ -85,13 +86,13 @@
assertTrue("handler_2 should not have received all its message (size:" + size + ")", size < MANY_MESSAGES);
assertTrue(handler_2.await(2, SECONDS));
- List<Ping> packetsReceivedByHandler_2 = handler_2.getPackets();
+ List<Packet> packetsReceivedByHandler_2 = handler_2.getPackets();
assertEquals(MANY_MESSAGES, packetsReceivedByHandler_2.size());
// we check that handler_2 receives all its messages in order:
for (int i = 0; i < MANY_MESSAGES; i++)
{
- Ping p = packetsReceivedByHandler_2.get(i);
- assertEquals(i, p.getSessionID());
+ ConnectionCreateSessionResponseMessage receivedPacket = (ConnectionCreateSessionResponseMessage) packetsReceivedByHandler_2.get(i);
+ assertEquals(i, receivedPacket.getSessionID());
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerTest.java 2008-05-19 13:39:11 UTC (rev 4237)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerTest.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -18,6 +18,7 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaHandler;
+import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
@@ -59,16 +60,16 @@
{
packetHandler.expectMessage(1);
- Ping ping = new Ping(randomLong());
- ping.setTargetID(packetHandler.getID());
- ping.setExecutorID(packetHandler.getID());
+ ConnectionCreateSessionResponseMessage packet = new ConnectionCreateSessionResponseMessage(randomLong());
+ packet.setTargetID(packetHandler.getID());
+ packet.setExecutorID(packetHandler.getID());
- handler.messageReceived(null, ping);
+ handler.messageReceived(null, packet);
assertTrue(packetHandler.await(500, MILLISECONDS));
assertEquals(1, packetHandler.getPackets().size());
- assertEquals(ping.getSessionID(), packetHandler.getPackets().get(0)
- .getSessionID());
+ ConnectionCreateSessionResponseMessage receivedPacket = (ConnectionCreateSessionResponseMessage) packetHandler.getPackets().get(0);
+ assertEquals(packet.getSessionID(), receivedPacket.getSessionID());
}
// TestCase overrides --------------------------------------------
Deleted: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java 2008-05-19 13:39:11 UTC (rev 4237)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.tests.integration.core.remoting.mina;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static junit.framework.Assert.fail;
-
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.Assert;
-
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
-import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
-import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class PingHandler extends TestPacketHandler
-{
- // Constants -----------------------------------------------------
-
- private static final Logger log = Logger.getLogger(PingHandler.class);
-
-
- // Attributes ----------------------------------------------------
-
- private int sleepTime;
- private TimeUnit timeUnit;
- private PacketReturner lastSender;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public PingHandler(final long id)
- {
- super(id);
- }
-
- // Public --------------------------------------------------------
-
- public void setSleepTime(int sleepTime, TimeUnit timeUnit)
- {
- this.sleepTime = sleepTime;
- this.timeUnit = timeUnit;
- }
-
- public PacketReturner getLastSender()
- {
- return lastSender;
- }
-
- // TestPacketHandler overrides -----------------------------------
-
- protected boolean isRequest(final Packet packet)
- {
- return packet.getTargetID() != EmptyPacket.NO_ID_SET && packet.getResponseTargetID() != EmptyPacket.NO_ID_SET;
- }
-
- @Override
- protected void doHandle(Packet packet, PacketReturner sender)
- {
- Assert.assertTrue(packet instanceof Ping);
-
- lastSender = sender;
-
- if (sleepTime > 0)
- {
- try
- {
- Thread.sleep(MILLISECONDS.convert(sleepTime, timeUnit));
- } catch (InterruptedException e)
- {
- fail();
- }
- }
-
- Ping message = (Ping) packet;
- if (isRequest(message))
- {
- Pong response = new Pong(message.getSessionID(), true);
- response.normalize(message);
- try
- {
- sender.send(response);
- }
- catch (Exception e)
- {
- log.error("Failed to handle", e);
- }
- }
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java 2008-05-19 13:39:11 UTC (rev 4237)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -14,18 +14,17 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
public class TestPacketHandler implements PacketHandler
{
private final long id;
- private final List<Ping> packets;
+ private final List<Packet> packets;
private CountDownLatch latch;
public TestPacketHandler(final long id)
{
this.id = id;
- packets = new ArrayList<Ping>();
+ packets = new ArrayList<Packet>();
}
public long getID()
@@ -39,7 +38,7 @@
return false;
boolean receivedAll = latch.await(time, timeUnit);
if (!receivedAll)
- System.out.println("Received only " + latch.getCount() + " packets");
+ System.out.println("Still expecting to receive " + latch.getCount() + " packets");
return receivedAll;
}
@@ -50,7 +49,7 @@
public void handle(Packet packet, PacketReturner sender)
{
- packets.add((Ping) packet);
+ packets.add(packet);
doHandle(packet, sender);
@@ -62,7 +61,7 @@
{
}
- public List<Ping> getPackets()
+ public List<Packet> getPackets()
{
return packets;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-05-19 13:39:11 UTC (rev 4237)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-05-19 15:53:53 UTC (rev 4238)
@@ -19,11 +19,13 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.NIOSession;
+import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
+import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
-import org.jboss.messaging.tests.integration.core.remoting.mina.PingHandler;
+import org.jboss.messaging.tests.integration.core.remoting.mina.Handler;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
/**
@@ -39,7 +41,7 @@
// Attributes ----------------------------------------------------
- protected PingHandler serverPacketHandler;
+ protected Handler serverPacketHandler;
protected PacketDispatcher serverDispatcher;
protected PacketDispatcher clientDispatcher;
@@ -70,37 +72,39 @@
{
serverPacketHandler.expectMessage(1);
- Ping packet = new Ping(randomLong());
+
+ ConnectionCreateSessionResponseMessage packet = new ConnectionCreateSessionResponseMessage(randomLong());
packet.setTargetID(serverPacketHandler.getID());
session.write(packet);
assertTrue(serverPacketHandler.await(2, SECONDS));
- List<Ping> messages = serverPacketHandler.getPackets();
+ List<Packet> messages = serverPacketHandler.getPackets();
assertEquals(1, messages.size());
- assertEquals(packet.getSessionID(), messages.get(0).getSessionID());
+ ConnectionCreateSessionResponseMessage receivedMessage = (ConnectionCreateSessionResponseMessage) messages.get(0);
+ assertEquals(packet.getSessionID(), receivedMessage.getSessionID());
}
public void testWriteMany() throws Exception
{
serverPacketHandler.expectMessage(MANY_MESSAGES);
- Ping[] packets = new Ping[MANY_MESSAGES];
+ ConnectionCreateSessionResponseMessage[] packets = new ConnectionCreateSessionResponseMessage[MANY_MESSAGES];
for (int i = 0; i < MANY_MESSAGES; i++)
{
- packets[i] = new Ping(i);
+ packets[i] = new ConnectionCreateSessionResponseMessage(i);
packets[i].setTargetID(serverPacketHandler.getID());
session.write(packets[i]);
}
assertTrue(serverPacketHandler.await(25, SECONDS));
- List<Ping> receivedPackets = serverPacketHandler.getPackets();
+ List<Packet> receivedPackets = serverPacketHandler.getPackets();
assertEquals(MANY_MESSAGES, receivedPackets.size());
for (int i = 0; i < MANY_MESSAGES; i++)
{
- Ping receivedPacket = receivedPackets.get(i);
+ ConnectionCreateSessionResponseMessage receivedPacket = (ConnectionCreateSessionResponseMessage) receivedPackets.get(i);
assertEquals(packets[i].getSessionID(), receivedPacket.getSessionID());
}
}
@@ -113,7 +117,7 @@
serverPacketHandler.expectMessage(1);
clientHandler.expectMessage(1);
- Ping packet = new Ping(randomLong());
+ ConnectionCreateSessionResponseMessage packet = new ConnectionCreateSessionResponseMessage(randomLong());
packet.setTargetID(serverPacketHandler.getID());
packet.setResponseTargetID(serverPacketHandler.getID());
// send a packet to create a sender when the server
@@ -124,15 +128,15 @@
assertNotNull(serverPacketHandler.getLastSender());
PacketReturner sender = serverPacketHandler.getLastSender();
- Ping packetFromServer = new Ping(randomLong());
+ ConnectionCreateSessionResponseMessage packetFromServer = new ConnectionCreateSessionResponseMessage(randomLong());
packetFromServer.setTargetID(clientHandler.getID());
sender.send(packetFromServer);
assertTrue(clientHandler.await(2, SECONDS));
- List<Ping> packets = clientHandler.getPackets();
+ List<Packet> packets = clientHandler.getPackets();
assertEquals(1, packets.size());
- Ping packetReceivedByClient = packets.get(0);
+ ConnectionCreateSessionResponseMessage packetReceivedByClient = (ConnectionCreateSessionResponseMessage) packets.get(0);
assertEquals(packetFromServer.getSessionID(), packetReceivedByClient.getSessionID());
}
@@ -148,7 +152,7 @@
connector = createNIOConnector(clientDispatcher);
session = connector.connect();
- serverPacketHandler = new PingHandler(generateID());
+ serverPacketHandler = new Handler(generateID());
serverDispatcher.register(serverPacketHandler);
}
More information about the jboss-cvs-commits
mailing list