[jboss-cvs] JBoss Messaging SVN: r4191 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/wireformat and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 14 09:35:05 EDT 2008
Author: jmesnil
Date: 2008-05-14 09:35:05 -0400 (Wed, 14 May 2008)
New Revision: 4191
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java
trunk/tests/src/org/jboss/messaging/tests/stress/
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MessagingCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java
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/PacketDispatcherTest.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
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
Log:
* removed Bytes & Text packet (which were used by tests only)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MessagingCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MessagingCodec.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MessagingCodec.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -6,7 +6,6 @@
*/
package org.jboss.messaging.core.remoting.impl.mina;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.BYTES;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CLOSE;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CREATECONNECTION_RESP;
@@ -14,7 +13,6 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.NULL;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.PING;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.PONG;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.TEXT;
import static org.jboss.messaging.util.DataConstants.SIZE_INT;
import org.apache.mina.common.IoBuffer;
@@ -27,7 +25,6 @@
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
@@ -70,7 +67,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
import org.jboss.messaging.util.MessagingBuffer;
/**
@@ -158,18 +154,6 @@
packet = new EmptyPacket(EmptyPacket.NULL);
break;
}
- case TEXT:
- {
- //TODO get rid of this!!!
- packet = new TextPacket();
- break;
- }
- case BYTES:
- {
- //TODO get rid of this!!!
- packet = new BytesPacket();
- break;
- }
case PING:
{
packet = new Ping();
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/BytesPacket.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.wireformat;
-
-import org.jboss.messaging.util.MessagingBuffer;
-
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- *
- * @version <tt>$Revision$</tt>
- */
-public class BytesPacket extends EmptyPacket
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private byte[] bytes;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public BytesPacket(final byte[] bytes)
- {
- super(BYTES);
-
- this.bytes = bytes;
- }
-
- public BytesPacket()
- {
- super(BYTES);
- }
-
- // Public --------------------------------------------------------
-
- public byte[] getBytes()
- {
- return bytes;
- }
-
- @Override
- public String toString()
- {
- return getParentString() + ", bytes.length=" + bytes.length + "]";
- }
-
- public void encodeBody(final MessagingBuffer buffer)
- {
- buffer.putInt(bytes.length);
-
- buffer.putBytes(bytes);
- }
-
- public void decodeBody(final MessagingBuffer buffer)
- {
- bytes = new byte[buffer.getInt()];
-
- buffer.getBytes(bytes);
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/EmptyPacket.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -37,8 +37,6 @@
// ------------------------------------------------------------------------------------
public static final byte NULL = 1;
- public static final byte TEXT = 2;
- public static final byte BYTES = 3;
public static final byte PING = 4;
public static final byte PONG = 5;
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/TextPacket.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.wireformat;
-
-import org.jboss.messaging.util.MessagingBuffer;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- *
- * @version <tt>$Revision$</tt>
- */
-public class TextPacket extends EmptyPacket
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private String text;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public TextPacket(final String text)
- {
- super(TEXT);
-
- this.text = text;
- }
-
- public TextPacket()
- {
- super(TEXT);
- }
-
- // Public --------------------------------------------------------
-
- public String getText()
- {
- return text;
- }
-
- public void encodeBody(final MessagingBuffer buffer)
- {
- buffer.putNullableString(text);
- }
-
- public void decodeBody(final MessagingBuffer buffer)
- {
- text = buffer.getNullableString();
- }
-
- @Override
- public String toString()
- {
- return getParentString() + ", text=" + text + "]";
- }
-
- // 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-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -8,6 +8,7 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -20,7 +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.TextPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
/**
@@ -60,7 +61,7 @@
handler_1.expectMessage(2);
handler_2.expectMessage(MANY_MESSAGES);
- TextPacket packet_1 = new TextPacket("testSerializationOrder handled by handle_1");
+ Ping packet_1 = new Ping(randomLong());
packet_1.setTargetID(handler_1.getID());
packet_1.setExecutorID(handler_1.getID());
@@ -70,7 +71,7 @@
handler.messageReceived(null, packet_1);
for (int i = 0; i < MANY_MESSAGES; i++)
{
- TextPacket packet_2 = new TextPacket(Integer.toString(i));
+ Ping packet_2 = new Ping(i);
packet_2.setTargetID(handler_2.getID());
packet_2.setExecutorID(handler_2.getID());
handler.messageReceived(null, packet_2);
@@ -84,13 +85,13 @@
assertTrue("handler_2 should not have received all its message (size:" + size + ")", size < MANY_MESSAGES);
assertTrue(handler_2.await(2, SECONDS));
- List<TextPacket> packetsReceivedByHandler_2 = handler_2.getPackets();
+ List<Ping> 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++)
{
- TextPacket p = packetsReceivedByHandler_2.get(i);
- assertEquals(Integer.toString(i), p.getText());
+ Ping p = packetsReceivedByHandler_2.get(i);
+ assertEquals(i, p.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-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerTest.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -7,16 +7,18 @@
package org.jboss.messaging.tests.integration.core.remoting.mina;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import junit.framework.TestCase;
+import org.jboss.messaging.core.remoting.Packet;
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.TextPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
/**
@@ -45,7 +47,7 @@
public void testReceiveUnhandledAbstractPacket() throws Exception
{
- TextPacket packet = new TextPacket("testReceiveUnhandledAbstractPacket");
+ Packet packet = new Ping(randomLong());
packet.setExecutorID(packetHandler.getID());
handler.messageReceived(null, packet);
@@ -57,16 +59,16 @@
{
packetHandler.expectMessage(1);
- TextPacket packet = new TextPacket("testReceiveHandledAbstractPacket");
- packet.setTargetID(packetHandler.getID());
- packet.setExecutorID(packetHandler.getID());
+ Ping ping = new Ping(randomLong());
+ ping.setTargetID(packetHandler.getID());
+ ping.setExecutorID(packetHandler.getID());
- handler.messageReceived(null, packet);
+ handler.messageReceived(null, ping);
assertTrue(packetHandler.await(500, MILLISECONDS));
assertEquals(1, packetHandler.getPackets().size());
- assertEquals(packet.getText(), packetHandler.getPackets().get(0)
- .getText());
+ assertEquals(ping.getSessionID(), packetHandler.getPackets().get(0)
+ .getSessionID());
}
// TestCase overrides --------------------------------------------
Copied: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java (from rev 4187, trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/PingHandler.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -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.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 -------------------------------------------------
+}
Deleted: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -1,112 +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.TextPacket;
-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 ReversePacketHandler extends TestPacketHandler
-{
- // Constants -----------------------------------------------------
-
- private static final Logger log = Logger.getLogger(ReversePacketHandler.class);
-
-
- // Attributes ----------------------------------------------------
-
- private int sleepTime;
- private TimeUnit timeUnit;
- private PacketReturner lastSender;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public ReversePacketHandler(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 TextPacket);
-
- lastSender = sender;
-
- if (sleepTime > 0)
- {
- try
- {
- Thread.sleep(MILLISECONDS.convert(sleepTime, timeUnit));
- } catch (InterruptedException e)
- {
- fail();
- }
- }
-
- TextPacket message = (TextPacket) packet;
- if (isRequest(message))
- {
- TextPacket response = new TextPacket(TestSupport.reverse(message.getText()));
- 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/PacketDispatcherTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -18,7 +18,8 @@
import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
+import org.jboss.messaging.tests.util.RandomUtil;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -91,7 +92,7 @@
PacketHandler handler = createMock(PacketHandler.class);
PacketReturner sender = createMock(PacketReturner.class);
- TextPacket packet = new TextPacket("testDispatch");
+ Ping packet = new Ping(randomLong());
long id = randomLong();
expect(handler.getID()).andStubReturn(id);
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-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -14,18 +14,18 @@
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.TextPacket;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
public class TestPacketHandler implements PacketHandler
{
private final long id;
- private final List<TextPacket> packets;
+ private final List<Ping> packets;
private CountDownLatch latch;
public TestPacketHandler(final long id)
{
this.id = id;
- packets = new ArrayList<TextPacket>();
+ packets = new ArrayList<Ping>();
}
public long getID()
@@ -47,7 +47,7 @@
public void handle(Packet packet, PacketReturner sender)
{
- packets.add((TextPacket) packet);
+ packets.add((Ping) packet);
doHandle(packet, sender);
@@ -59,7 +59,7 @@
{
}
- public List<TextPacket> getPackets()
+ public List<Ping> 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-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -8,6 +8,7 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jboss.messaging.tests.integration.core.remoting.mina.TestSupport.MANY_MESSAGES;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
@@ -21,8 +22,8 @@
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.TextPacket;
-import org.jboss.messaging.tests.integration.core.remoting.mina.ReversePacketHandler;
+import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
+import org.jboss.messaging.tests.integration.core.remoting.mina.PingHandler;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
/**
@@ -38,7 +39,7 @@
// Attributes ----------------------------------------------------
- protected ReversePacketHandler serverPacketHandler;
+ protected PingHandler serverPacketHandler;
protected PacketDispatcher serverDispatcher;
protected PacketDispatcher clientDispatcher;
@@ -69,39 +70,38 @@
{
serverPacketHandler.expectMessage(1);
- TextPacket packet = new TextPacket("testWrite");
+ Ping packet = new Ping(randomLong());
packet.setTargetID(serverPacketHandler.getID());
session.write(packet);
assertTrue(serverPacketHandler.await(2, SECONDS));
- List<TextPacket> messages = serverPacketHandler.getPackets();
+ List<Ping> messages = serverPacketHandler.getPackets();
assertEquals(1, messages.size());
- String response = ((TextPacket) messages.get(0)).getText();
- assertEquals(packet.getText(), response);
+ assertEquals(packet.getSessionID(), messages.get(0).getSessionID());
}
public void testWriteMany() throws Exception
{
serverPacketHandler.expectMessage(MANY_MESSAGES);
- TextPacket[] packets = new TextPacket[MANY_MESSAGES];
+ Ping[] packets = new Ping[MANY_MESSAGES];
for (int i = 0; i < MANY_MESSAGES; i++)
{
- packets[i] = new TextPacket("testSendManyOneWay " + i);
+ packets[i] = new Ping(i);
packets[i].setTargetID(serverPacketHandler.getID());
session.write(packets[i]);
}
assertTrue(serverPacketHandler.await(10, SECONDS));
- List<TextPacket> receivedPackets = serverPacketHandler.getPackets();
+ List<Ping> receivedPackets = serverPacketHandler.getPackets();
assertEquals(MANY_MESSAGES, receivedPackets.size());
for (int i = 0; i < MANY_MESSAGES; i++)
{
- TextPacket receivedPacket = (TextPacket) receivedPackets.get(i);
- assertEquals(packets[i].getText(), receivedPacket.getText());
+ Ping receivedPacket = receivedPackets.get(i);
+ assertEquals(packets[i].getSessionID(), receivedPacket.getSessionID());
}
}
@@ -113,8 +113,7 @@
serverPacketHandler.expectMessage(1);
clientHandler.expectMessage(1);
- TextPacket packet = new TextPacket(
- "testClientHandlePacketSentByServer from client");
+ Ping packet = new Ping(randomLong());
packet.setTargetID(serverPacketHandler.getID());
packet.setResponseTargetID(serverPacketHandler.getID());
// send a packet to create a sender when the server
@@ -125,17 +124,16 @@
assertNotNull(serverPacketHandler.getLastSender());
PacketReturner sender = serverPacketHandler.getLastSender();
- TextPacket packetFromServer = new TextPacket(
- "testClientHandlePacketSentByServer from server");
+ Ping packetFromServer = new Ping(randomLong());
packetFromServer.setTargetID(clientHandler.getID());
sender.send(packetFromServer);
assertTrue(clientHandler.await(2, SECONDS));
- List<TextPacket> packets = clientHandler.getPackets();
+ List<Ping> packets = clientHandler.getPackets();
assertEquals(1, packets.size());
- TextPacket packetReceivedByClient = (TextPacket) packets.get(0);
- assertEquals(packetFromServer.getText(), packetReceivedByClient.getText());
+ Ping packetReceivedByClient = packets.get(0);
+ assertEquals(packetFromServer.getSessionID(), packetReceivedByClient.getSessionID());
}
// Protected -----------------------------------------------------
@@ -150,7 +148,7 @@
connector = createNIOConnector(clientDispatcher);
session = connector.connect();
- serverPacketHandler = new ReversePacketHandler(generateID());
+ serverPacketHandler = new PingHandler(generateID());
serverDispatcher.register(serverPacketHandler);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-05-14 12:25:29 UTC (rev 4190)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-05-14 13:35:05 UTC (rev 4191)
@@ -6,7 +6,6 @@
*/
package org.jboss.messaging.tests.unit.core.remoting.impl.wireformat;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.BYTES;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CLOSE;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CONN_CREATESESSION;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.CONN_CREATESESSION_RESP;
@@ -58,7 +57,6 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_XA_SET_TIMEOUT_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_XA_START;
import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.SESS_XA_SUSPEND;
-import static org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket.TEXT;
import static org.jboss.messaging.tests.unit.core.remoting.impl.wireformat.CodecAssert.assertEqualsByteArrays;
import static org.jboss.messaging.tests.unit.core.remoting.impl.wireformat.CodecAssert.assertSameXids;
import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
@@ -80,7 +78,6 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.mina.BufferWrapper;
import org.jboss.messaging.core.remoting.impl.mina.MessagingCodec;
-import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
@@ -120,10 +117,8 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.XidCodecSupport;
import org.jboss.messaging.core.version.impl.VersionImpl;
-import org.jboss.messaging.tests.util.RandomUtil;
import org.jboss.messaging.tests.util.UnitTestCase;
import org.jboss.messaging.util.MessagingBuffer;
import org.jboss.messaging.util.SimpleString;
@@ -316,34 +311,6 @@
assertEquals(pong.isSessionFailed(), decodedPong.isSessionFailed());
}
- public void testTextPacket() throws Exception
- {
- TextPacket packet = new TextPacket("testTextPacket");
-
- Packet decodedPacket = encodeAndCheckBytesAndDecode(packet, packet
- .getText());
-
- assertTrue(decodedPacket instanceof TextPacket);
- TextPacket p = (TextPacket) decodedPacket;
-
- assertEquals(TEXT, p.getType());
- assertEquals(packet.getText(), p.getText());
- }
-
- public void testBytesPacket() throws Exception
- {
- BytesPacket packet = new BytesPacket(RandomUtil.randomBytes());
-
- Packet decodedPacket = encodeAndCheckBytesAndDecode(packet, packet
- .getBytes());
-
- assertTrue(decodedPacket instanceof BytesPacket);
- BytesPacket p = (BytesPacket) decodedPacket;
-
- assertEquals(BYTES, p.getType());
- assertEqualsByteArrays(packet.getBytes(), p.getBytes());
- }
-
public void testCreateConnectionRequest() throws Exception
{
int version = randomInt();
More information about the jboss-cvs-commits
mailing list