[jboss-cvs] JBoss Messaging SVN: r3497 - in trunk/tests/src/org/jboss/messaging/core/remoting: impl and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Dec 13 03:30:53 EST 2007


Author: jmesnil
Date: 2007-12-13 03:30:53 -0500 (Thu, 13 Dec 2007)
New Revision: 3497

Added:
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java
Removed:
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java
   trunk/tests/src/org/jboss/messaging/core/remoting/integration/
Modified:
   trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java
Log:
* moved MINA integration test to package org.jboss.messaging.core.remoting.impl.mina.integration.test

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test (from rev 3480, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test)

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaClientTest.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,171 +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.integration.test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.jboss.messaging.core.remoting.Client;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.integration.MinaConnector;
-import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.TextPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class MinaClientTest extends TestSupport
-{
-   private ReversePacketHandler serverPacketHandler;
-
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testConnected() throws Exception
-   {
-      Client client = new Client(new MinaConnector());
-
-      assertFalse(client.isConnected());
-
-      client.connect("localhost", PORT, TCP);
-      assertTrue(client.isConnected());
-
-      assertTrue(client.disconnect());
-      assertFalse(client.isConnected());
-      assertFalse(client.disconnect());
-   }
-      
-   public void testSendOneWay() throws Exception
-   {
-      serverPacketHandler.expectMessage(1);
-
-      TextPacket packet = new TextPacket("testSendOneWay");
-      packet.setVersion((byte) 1);
-      packet.setTargetID(serverPacketHandler.getID());
-      client.sendOneWay(packet);
-
-      assertTrue(serverPacketHandler.await(2, SECONDS));
-
-      List<TextPacket> messages = serverPacketHandler.getPackets();
-      assertEquals(1, messages.size());
-      String response = ((TextPacket) messages.get(0)).getText();
-      assertEquals(packet.getText(), response);
-   }
-
-   public void testSendManyOneWay() throws Exception
-   {
-      serverPacketHandler.expectMessage(MANY_MESSAGES);
-
-      TextPacket[] packets = new TextPacket[MANY_MESSAGES];
-      for (int i = 0; i < MANY_MESSAGES; i++)
-      {
-         packets[i] = new TextPacket("testSendManyOneWay " + i);
-         packets[i].setVersion((byte) 1);
-         packets[i].setTargetID(serverPacketHandler.getID());
-         client.sendOneWay(packets[i]);
-      }
-
-      assertTrue(serverPacketHandler.await(10, SECONDS));
-
-      List<TextPacket> 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());
-      }
-   }
-
-   public void testSendOneWayWithCallbackHandler() throws Exception
-   {
-      TestPacketHandler callbackHandler = new TestPacketHandler();
-      callbackHandler.expectMessage(1);
-
-      PacketDispatcher.client.register(callbackHandler);
-
-      TextPacket packet = new TextPacket("testSendOneWayWithCallbackHandler");
-      packet.setVersion((byte) 1);
-      packet.setTargetID(serverPacketHandler.getID());
-      packet.setCallbackID(callbackHandler.getID());
-
-      client.sendOneWay(packet);
-
-      assertTrue(callbackHandler.await(5, SECONDS));
-
-      assertEquals(1, callbackHandler.getPackets().size());
-      String response = callbackHandler.getPackets().get(0).getText();
-      assertEquals(reverse(packet.getText()), response);
-   }
-
-   public void testSendBlocking() throws Exception
-   {
-      TextPacket request = new TextPacket("testSendBlocking");
-      request.setVersion((byte) 1);
-      request.setTargetID(serverPacketHandler.getID());
-
-      AbstractPacket receivedPacket = client.sendBlocking(request);
-
-      assertNotNull(receivedPacket);
-      assertTrue(receivedPacket instanceof TextPacket);
-      TextPacket response = (TextPacket) receivedPacket;
-      assertEquals(reverse(request.getText()), response.getText());
-   }
-
-   public void testSendBlockingWithTimeout() throws Exception
-   {
-      client.setBlockingRequestTimeout(500, MILLISECONDS);
-      serverPacketHandler.setSleepTime(1000, MILLISECONDS);
-
-      AbstractPacket packet = new TextPacket("testSendBlockingWithTimeout");
-      packet.setTargetID(serverPacketHandler.getID());
-      
-      packet.setVersion((byte) 1);
-
-      try
-      {
-         client.sendBlocking(packet);
-         fail("a IOException should be thrown");
-      } catch (IOException e)
-      {
-      }
-   }
-
-   // TestCase implementation ---------------------------------------
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      startServer(TestSupport.PORT, TRANSPORT);
-      startClient(TestSupport.PORT, TRANSPORT);
-
-      serverPacketHandler = new ReversePacketHandler();
-      PacketDispatcher.server.register(serverPacketHandler);
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      PacketDispatcher.server.unregister(serverPacketHandler.getID());
-
-      client.disconnect();
-      stopServer();
-   }
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaClientTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,173 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.messaging.core.remoting.Client;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.impl.mina.integration.test.ReversePacketHandler;
+import org.jboss.messaging.core.remoting.impl.mina.integration.test.TestSupport;
+import org.jboss.messaging.core.remoting.integration.MinaConnector;
+import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.TextPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public class MinaClientTest extends TestSupport
+{
+   private ReversePacketHandler serverPacketHandler;
+
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   public void testConnected() throws Exception
+   {
+      Client client = new Client(new MinaConnector());
+
+      assertFalse(client.isConnected());
+
+      client.connect("localhost", PORT, TCP);
+      assertTrue(client.isConnected());
+
+      assertTrue(client.disconnect());
+      assertFalse(client.isConnected());
+      assertFalse(client.disconnect());
+   }
+      
+   public void testSendOneWay() throws Exception
+   {
+      serverPacketHandler.expectMessage(1);
+
+      TextPacket packet = new TextPacket("testSendOneWay");
+      packet.setVersion((byte) 1);
+      packet.setTargetID(serverPacketHandler.getID());
+      client.sendOneWay(packet);
+
+      assertTrue(serverPacketHandler.await(2, SECONDS));
+
+      List<TextPacket> messages = serverPacketHandler.getPackets();
+      assertEquals(1, messages.size());
+      String response = ((TextPacket) messages.get(0)).getText();
+      assertEquals(packet.getText(), response);
+   }
+
+   public void testSendManyOneWay() throws Exception
+   {
+      serverPacketHandler.expectMessage(MANY_MESSAGES);
+
+      TextPacket[] packets = new TextPacket[MANY_MESSAGES];
+      for (int i = 0; i < MANY_MESSAGES; i++)
+      {
+         packets[i] = new TextPacket("testSendManyOneWay " + i);
+         packets[i].setVersion((byte) 1);
+         packets[i].setTargetID(serverPacketHandler.getID());
+         client.sendOneWay(packets[i]);
+      }
+
+      assertTrue(serverPacketHandler.await(10, SECONDS));
+
+      List<TextPacket> 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());
+      }
+   }
+
+   public void testSendOneWayWithCallbackHandler() throws Exception
+   {
+      TestPacketHandler callbackHandler = new TestPacketHandler();
+      callbackHandler.expectMessage(1);
+
+      PacketDispatcher.client.register(callbackHandler);
+
+      TextPacket packet = new TextPacket("testSendOneWayWithCallbackHandler");
+      packet.setVersion((byte) 1);
+      packet.setTargetID(serverPacketHandler.getID());
+      packet.setCallbackID(callbackHandler.getID());
+
+      client.sendOneWay(packet);
+
+      assertTrue(callbackHandler.await(5, SECONDS));
+
+      assertEquals(1, callbackHandler.getPackets().size());
+      String response = callbackHandler.getPackets().get(0).getText();
+      assertEquals(reverse(packet.getText()), response);
+   }
+
+   public void testSendBlocking() throws Exception
+   {
+      TextPacket request = new TextPacket("testSendBlocking");
+      request.setVersion((byte) 1);
+      request.setTargetID(serverPacketHandler.getID());
+
+      AbstractPacket receivedPacket = client.sendBlocking(request);
+
+      assertNotNull(receivedPacket);
+      assertTrue(receivedPacket instanceof TextPacket);
+      TextPacket response = (TextPacket) receivedPacket;
+      assertEquals(reverse(request.getText()), response.getText());
+   }
+
+   public void testSendBlockingWithTimeout() throws Exception
+   {
+      client.setBlockingRequestTimeout(500, MILLISECONDS);
+      serverPacketHandler.setSleepTime(1000, MILLISECONDS);
+
+      AbstractPacket packet = new TextPacket("testSendBlockingWithTimeout");
+      packet.setTargetID(serverPacketHandler.getID());
+      
+      packet.setVersion((byte) 1);
+
+      try
+      {
+         client.sendBlocking(packet);
+         fail("a IOException should be thrown");
+      } catch (IOException e)
+      {
+      }
+   }
+
+   // TestCase implementation ---------------------------------------
+
+   @Override
+   protected void setUp() throws Exception
+   {
+      startServer(TestSupport.PORT, TRANSPORT);
+      startClient(TestSupport.PORT, TRANSPORT);
+
+      serverPacketHandler = new ReversePacketHandler();
+      PacketDispatcher.server.register(serverPacketHandler);
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      PacketDispatcher.server.unregister(serverPacketHandler.getID());
+
+      client.disconnect();
+      stopServer();
+   }
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaHandlerTest.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,98 +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.integration.test;
-
-import junit.framework.TestCase;
-
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.integration.MinaHandler;
-import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
-import org.jboss.messaging.core.remoting.wireformat.TextPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class MinaHandlerTest extends TestCase
-{
-
-   private MinaHandler handler;
-   private TestPacketHandler packetHandler;
-
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testReceiveNotAbstractPacket() throws Exception
-   {
-      try
-      {
-         handler.messageReceived(null, new Object());
-         fail();
-      } catch (IllegalArgumentException e)
-      {
-      }
-   }
-
-   public void testReceiveUnhandledAbstractPacket() throws Exception
-   {
-      TextPacket packet = new TextPacket("testReceiveUnhandledAbstractPacket");
-
-      handler.messageReceived(null, packet);
-
-      assertEquals(0, packetHandler.getPackets().size());
-   }
-
-   public void testReceiveHandledAbstractPacket() throws Exception
-   {
-
-      TextPacket packet = new TextPacket("testReceiveHandledAbstractPacket");
-      packet.setTargetID(packetHandler.getID());
-
-      handler.messageReceived(null, packet);
-
-      assertEquals(1, packetHandler.getPackets().size());
-      assertEquals(packet.getText(), packetHandler.getPackets().get(0)
-            .getText());
-   }
-
-   // TestCase overrides --------------------------------------------
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      handler = new MinaHandler(PacketDispatcher.client);
-
-      packetHandler = new TestPacketHandler();
-      PacketDispatcher.client.register(packetHandler);
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      PacketDispatcher.client.unregister(packetHandler.getID());
-      packetHandler = null;
-
-      handler = null;
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaHandlerTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaHandlerTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.integration.MinaHandler;
+import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
+import org.jboss.messaging.core.remoting.wireformat.TextPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * 
+ * @version <tt>$Revision$</tt>
+ * 
+ */
+public class MinaHandlerTest extends TestCase
+{
+
+   private MinaHandler handler;
+   private TestPacketHandler packetHandler;
+
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   public void testReceiveNotAbstractPacket() throws Exception
+   {
+      try
+      {
+         handler.messageReceived(null, new Object());
+         fail();
+      } catch (IllegalArgumentException e)
+      {
+      }
+   }
+
+   public void testReceiveUnhandledAbstractPacket() throws Exception
+   {
+      TextPacket packet = new TextPacket("testReceiveUnhandledAbstractPacket");
+
+      handler.messageReceived(null, packet);
+
+      assertEquals(0, packetHandler.getPackets().size());
+   }
+
+   public void testReceiveHandledAbstractPacket() throws Exception
+   {
+
+      TextPacket packet = new TextPacket("testReceiveHandledAbstractPacket");
+      packet.setTargetID(packetHandler.getID());
+
+      handler.messageReceived(null, packet);
+
+      assertEquals(1, packetHandler.getPackets().size());
+      assertEquals(packet.getText(), packetHandler.getPackets().get(0)
+            .getText());
+   }
+
+   // TestCase overrides --------------------------------------------
+
+   @Override
+   protected void setUp() throws Exception
+   {
+      handler = new MinaHandler(PacketDispatcher.client);
+
+      packetHandler = new TestPacketHandler();
+      PacketDispatcher.client.register(packetHandler);
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      PacketDispatcher.client.unregister(packetHandler.getID());
+      packetHandler = null;
+
+      handler = null;
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaInspectorTest.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,109 +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.integration.test;
-
-import static org.apache.mina.filter.reqres.ResponseType.WHOLE;
-
-import java.util.UUID;
-
-import junit.framework.TestCase;
-
-import org.jboss.messaging.core.remoting.integration.MinaInspector;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.NullPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class MinaInspectorTest extends TestCase
-{
-
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   private MinaInspector inspector;
-
-   public void testGetRequestIdForNull()
-   {
-      assertNull(inspector.getRequestId(null));
-   }
-
-   public void testGetRequestIdForNotAbstractPacket()
-   {
-      assertNull(inspector.getRequestId(new Object()));
-   }
-
-   public void testGetRequestIdForAbstractPacketWhichIsNotRequest()
-   {
-      AbstractPacket packet = new NullPacket();
-      packet.setTargetID(UUID.randomUUID().toString());
-      assertFalse(packet.isRequest());
-
-      assertNull(inspector.getRequestId(packet));
-   }
-
-   public void testGetRequestIdForAbstractPacketWhichIsRequest()
-   {
-      AbstractPacket packet = new NullPacket();
-      packet.setTargetID(UUID.randomUUID().toString());
-      packet.setCorrelationID(System.currentTimeMillis());
-      assertTrue(packet.isRequest());
-
-      Object requestID = inspector.getRequestId(packet);
-      assertNotNull(requestID);
-      assertEquals(packet.getCorrelationID(), requestID);
-   }
-
-   public void testGetResponseTypeForNull()
-   {
-      assertNull(inspector.getResponseType(null));
-   }
-
-   public void testGetResponseTypeForNotAbstractPacket()
-   {
-      assertNull(inspector.getResponseType(new Object()));
-   }
-
-   public void testGetResponseTypeForAbstractPacket()
-   {
-      AbstractPacket packet = new NullPacket();
-
-      assertEquals(WHOLE, inspector.getResponseType(packet));
-   }
-
-   // TestCase overrides --------------------------------------------
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      inspector = new MinaInspector();
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      inspector = null;
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaInspectorTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaInspectorTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static org.apache.mina.filter.reqres.ResponseType.WHOLE;
+
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.remoting.integration.MinaInspector;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.NullPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * 
+ * @version <tt>$Revision$</tt>
+ * 
+ */
+public class MinaInspectorTest extends TestCase
+{
+
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   private MinaInspector inspector;
+
+   public void testGetRequestIdForNull()
+   {
+      assertNull(inspector.getRequestId(null));
+   }
+
+   public void testGetRequestIdForNotAbstractPacket()
+   {
+      assertNull(inspector.getRequestId(new Object()));
+   }
+
+   public void testGetRequestIdForAbstractPacketWhichIsNotRequest()
+   {
+      AbstractPacket packet = new NullPacket();
+      packet.setTargetID(UUID.randomUUID().toString());
+      assertFalse(packet.isRequest());
+
+      assertNull(inspector.getRequestId(packet));
+   }
+
+   public void testGetRequestIdForAbstractPacketWhichIsRequest()
+   {
+      AbstractPacket packet = new NullPacket();
+      packet.setTargetID(UUID.randomUUID().toString());
+      packet.setCorrelationID(System.currentTimeMillis());
+      assertTrue(packet.isRequest());
+
+      Object requestID = inspector.getRequestId(packet);
+      assertNotNull(requestID);
+      assertEquals(packet.getCorrelationID(), requestID);
+   }
+
+   public void testGetResponseTypeForNull()
+   {
+      assertNull(inspector.getResponseType(null));
+   }
+
+   public void testGetResponseTypeForNotAbstractPacket()
+   {
+      assertNull(inspector.getResponseType(new Object()));
+   }
+
+   public void testGetResponseTypeForAbstractPacket()
+   {
+      AbstractPacket packet = new NullPacket();
+
+      assertEquals(WHOLE, inspector.getResponseType(packet));
+   }
+
+   // TestCase overrides --------------------------------------------
+
+   @Override
+   protected void setUp() throws Exception
+   {
+      inspector = new MinaInspector();
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      inspector = null;
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaRemotingBufferTest.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,108 +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.integration.test;
-
-import static java.util.UUID.randomUUID;
-import junit.framework.TestCase;
-
-import org.apache.mina.common.IoBuffer;
-import org.jboss.messaging.core.remoting.codec.RemotingBuffer;
-import org.jboss.messaging.core.remoting.integration.MinaPacketCodec;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class MinaRemotingBufferTest extends TestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   private RemotingBuffer wrapper;
-   private IoBuffer buffer;
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      buffer = IoBuffer.allocate(256);
-      buffer.setAutoExpand(true);
-      wrapper = new MinaPacketCodec.BufferWrapper(buffer);
-   }
-
-   @Override
-   protected void tearDown() throws Exception
-   {
-      wrapper = null;
-      buffer = null;
-
-   }
-
-   public void testNullString() throws Exception
-   {
-      assertNull(putAndGetNullableString(null));
-   }
-
-   public void testEmptyString() throws Exception
-   {
-      String result = putAndGetNullableString("");
-
-      assertNotNull(result);
-      assertEquals("", result);
-   }
-
-   public void testNonEmptyString() throws Exception
-   {
-      String junk = randomUUID().toString();
-
-      String result = putAndGetNullableString(junk);
-
-      assertNotNull(result);
-      assertEquals(junk, result);
-   }
-
-   public void testPutTrueBoolean() throws Exception
-   {
-      wrapper.putBoolean(true);
-      
-      buffer.flip();
-      
-      assertTrue(wrapper.getBoolean());
-   }
-
-   public void testPutFalseBoolean() throws Exception
-   {
-      wrapper.putBoolean(false);
-      
-      buffer.flip();
-      
-      assertFalse(wrapper.getBoolean());
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   private String putAndGetNullableString(String nullableString) throws Exception
-   {
-      wrapper.putNullableString(nullableString);
-
-      buffer.flip();
-      
-      return wrapper.getNullableString();
-   }
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/MinaRemotingBufferTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaRemotingBufferTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static java.util.UUID.randomUUID;
+import junit.framework.TestCase;
+
+import org.apache.mina.common.IoBuffer;
+import org.jboss.messaging.core.remoting.codec.RemotingBuffer;
+import org.jboss.messaging.core.remoting.integration.MinaPacketCodec;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public class MinaRemotingBufferTest extends TestCase
+{
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   private RemotingBuffer wrapper;
+   private IoBuffer buffer;
+
+   @Override
+   protected void setUp() throws Exception
+   {
+      buffer = IoBuffer.allocate(256);
+      buffer.setAutoExpand(true);
+      wrapper = new MinaPacketCodec.BufferWrapper(buffer);
+   }
+
+   @Override
+   protected void tearDown() throws Exception
+   {
+      wrapper = null;
+      buffer = null;
+
+   }
+
+   public void testNullString() throws Exception
+   {
+      assertNull(putAndGetNullableString(null));
+   }
+
+   public void testEmptyString() throws Exception
+   {
+      String result = putAndGetNullableString("");
+
+      assertNotNull(result);
+      assertEquals("", result);
+   }
+
+   public void testNonEmptyString() throws Exception
+   {
+      String junk = randomUUID().toString();
+
+      String result = putAndGetNullableString(junk);
+
+      assertNotNull(result);
+      assertEquals(junk, result);
+   }
+
+   public void testPutTrueBoolean() throws Exception
+   {
+      wrapper.putBoolean(true);
+      
+      buffer.flip();
+      
+      assertTrue(wrapper.getBoolean());
+   }
+
+   public void testPutFalseBoolean() throws Exception
+   {
+      wrapper.putBoolean(false);
+      
+      buffer.flip();
+      
+      assertFalse(wrapper.getBoolean());
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   private String putAndGetNullableString(String nullableString) throws Exception
+   {
+      wrapper.putNullableString(nullableString);
+
+      buffer.flip();
+      
+      return wrapper.getNullableString();
+   }
+   // Inner classes -------------------------------------------------
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/ReversePacketHandler.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,92 +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.integration.test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static junit.framework.Assert.fail;
-import static org.jboss.messaging.core.remoting.integration.test.TestSupport.reverse;
-import static org.jboss.messaging.core.remoting.wireformat.AbstractPacket.NO_ID_SET;
-
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.Assert;
-
-import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.TextPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class ReversePacketHandler extends TestPacketHandler
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private int sleepTime;
-   private TimeUnit timeUnit;
-   private PacketSender lastSender;
- 
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void setSleepTime(int sleepTime, TimeUnit timeUnit)
-   {
-      this.sleepTime = sleepTime;
-      this.timeUnit = timeUnit;
-   }
-   
-   public PacketSender getLastSender()
-   {
-      return lastSender;
-   }
-   
-   // TestPacketHandler overrides -----------------------------------
-   
-   @Override
-   protected void doHandle(AbstractPacket packet, PacketSender 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 (message.isRequest() || !NO_ID_SET.equals(message.getCallbackID()))
-      {
-         TextPacket response = new TextPacket(reverse(message.getText()));
-         response.normalize(message);
-         sender.send(response);
-      }
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/ReversePacketHandler.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ReversePacketHandler.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static junit.framework.Assert.fail;
+import static org.jboss.messaging.core.remoting.impl.mina.integration.test.TestSupport.reverse;
+import static org.jboss.messaging.core.remoting.wireformat.AbstractPacket.NO_ID_SET;
+
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+
+import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.TextPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * 
+ * @version <tt>$Revision$</tt>
+ * 
+ */
+public class ReversePacketHandler extends TestPacketHandler
+{
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   private int sleepTime;
+   private TimeUnit timeUnit;
+   private PacketSender lastSender;
+ 
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   public void setSleepTime(int sleepTime, TimeUnit timeUnit)
+   {
+      this.sleepTime = sleepTime;
+      this.timeUnit = timeUnit;
+   }
+   
+   public PacketSender getLastSender()
+   {
+      return lastSender;
+   }
+   
+   // TestPacketHandler overrides -----------------------------------
+   
+   @Override
+   protected void doHandle(AbstractPacket packet, PacketSender 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 (message.isRequest() || !NO_ID_SET.equals(message.getCallbackID()))
+      {
+         TextPacket response = new TextPacket(reverse(message.getText()));
+         response.normalize(message);
+         sender.send(response);
+      }
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/TargetHandlerTest.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,97 +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.integration.test;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import java.util.List;
-
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
-import org.jboss.messaging.core.remoting.wireformat.TextPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public class TargetHandlerTest extends TestSupport
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private ReversePacketHandler serverPacketHandler;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testClientHandlePacketSentByServer() throws Exception
-   {
-      TestPacketHandler clientHandler = new TestPacketHandler();
-      PacketDispatcher.client.register(clientHandler);
-
-      serverPacketHandler.expectMessage(1);
-      clientHandler.expectMessage(1);
-
-      TextPacket packet = new TextPacket(
-            "testClientHandlePacketSentByServer from client");
-      packet.setVersion((byte) 1);
-      packet.setTargetID(serverPacketHandler.getID());
-      // send a packet to create a sender when the server
-      // handles the packet
-      client.sendOneWay(packet);
-
-      assertTrue(serverPacketHandler.await(2, SECONDS));
-
-      assertNotNull(serverPacketHandler.getLastSender());
-      PacketSender sender = serverPacketHandler.getLastSender();
-      TextPacket packetFromServer = new TextPacket(
-            "testClientHandlePacketSentByServer from server");
-      packetFromServer.setVersion((byte) 1);
-      packetFromServer.setTargetID(clientHandler.getID());
-      sender.send(packetFromServer);
-
-      assertTrue(clientHandler.await(2, SECONDS));
-
-      List<TextPacket> packets = clientHandler.getPackets();
-      assertEquals(1, packets.size());
-      TextPacket packetReceivedByClient = (TextPacket) packets.get(0);
-      assertEquals(packetFromServer.getText(), packetReceivedByClient.getText());
-   }
-
-   // TestCase overrides --------------------------------------------
-
-   public void setUp() throws Exception
-   {
-      startServer(PORT, TRANSPORT);
-      startClient(PORT, TRANSPORT);
-      
-      serverPacketHandler = new ReversePacketHandler();
-      PacketDispatcher.server.register(serverPacketHandler);
-   }
-
-   public void tearDown() throws Exception
-   {
-      PacketDispatcher.server.unregister(serverPacketHandler.getID());
-
-      client.disconnect();
-      stopServer();
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/TargetHandlerTest.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TargetHandlerTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.List;
+
+import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.test.unit.TestPacketHandler;
+import org.jboss.messaging.core.remoting.wireformat.TextPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public class TargetHandlerTest extends TestSupport
+{
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   private ReversePacketHandler serverPacketHandler;
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   public void testClientHandlePacketSentByServer() throws Exception
+   {
+      TestPacketHandler clientHandler = new TestPacketHandler();
+      PacketDispatcher.client.register(clientHandler);
+
+      serverPacketHandler.expectMessage(1);
+      clientHandler.expectMessage(1);
+
+      TextPacket packet = new TextPacket(
+            "testClientHandlePacketSentByServer from client");
+      packet.setVersion((byte) 1);
+      packet.setTargetID(serverPacketHandler.getID());
+      // send a packet to create a sender when the server
+      // handles the packet
+      client.sendOneWay(packet);
+
+      assertTrue(serverPacketHandler.await(2, SECONDS));
+
+      assertNotNull(serverPacketHandler.getLastSender());
+      PacketSender sender = serverPacketHandler.getLastSender();
+      TextPacket packetFromServer = new TextPacket(
+            "testClientHandlePacketSentByServer from server");
+      packetFromServer.setVersion((byte) 1);
+      packetFromServer.setTargetID(clientHandler.getID());
+      sender.send(packetFromServer);
+
+      assertTrue(clientHandler.await(2, SECONDS));
+
+      List<TextPacket> packets = clientHandler.getPackets();
+      assertEquals(1, packets.size());
+      TextPacket packetReceivedByClient = (TextPacket) packets.get(0);
+      assertEquals(packetFromServer.getText(), packetReceivedByClient.getText());
+   }
+
+   // TestCase overrides --------------------------------------------
+
+   public void setUp() throws Exception
+   {
+      startServer(PORT, TRANSPORT);
+      startClient(PORT, TRANSPORT);
+      
+      serverPacketHandler = new ReversePacketHandler();
+      PacketDispatcher.server.register(serverPacketHandler);
+   }
+
+   public void tearDown() throws Exception
+   {
+      PacketDispatcher.server.unregister(serverPacketHandler.getID());
+
+      client.disconnect();
+      stopServer();
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+}

Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/TestSupport.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -1,108 +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.integration.test;
-
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
-import junit.framework.TestCase;
-
-import org.jboss.messaging.core.remoting.Client;
-import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.core.remoting.integration.MinaConnector;
-import org.jboss.messaging.core.remoting.integration.MinaService;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public abstract class TestSupport extends TestCase
-{
-   // Constants -----------------------------------------------------
-
-   public static final int MANY_MESSAGES = 500;
-
-   /**
-    * Configurable by system property <code>transport.type</code>, default is
-    * TCP
-    */
-   public final static TransportType TRANSPORT;
-
-   // Attributes ----------------------------------------------------
-
-   Client client;
-
-   private MinaService service;
-
-   public static final int PORT = 9090;
-
-   // Static --------------------------------------------------------
-
-   static
-   {
-      String transportType = System.getProperty("transport.type", TCP
-            .toString());
-      TRANSPORT = TransportType.valueOf(transportType);
-      info("Default transport is " + TRANSPORT);
-   }
-
-   static String reverse(String text)
-   {
-      // Reverse text
-      StringBuffer buf = new StringBuffer(text.length());
-      for (int i = text.length() - 1; i >= 0; i--)
-      {
-         buf.append(text.charAt(i));
-      }
-      return buf.toString();
-   }
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   void startServer(int port, TransportType transport) throws Exception
-   {
-      startServer(port, transport, false);
-   }
-
-   void startServer(int port, TransportType transport, boolean useSSL)
-         throws Exception
-   {
-      service = new MinaService("localhost", port);
-      service.start();
-   }
-   
-   void stopServer()
-   {
-      service.stop();
-   }
-
-   void startClient(int port, TransportType transport) throws Exception
-   {
-      startClient(port, transport, false);
-   }
-
-   void startClient(int port, TransportType transport, boolean useSSL)
-         throws Exception
-   {
-      client = new Client(new MinaConnector());
-      client.connect("localhost", port, transport, useSSL);
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   private static void info(String info)
-   {
-      System.out.format("### %-50s ###\n", info);
-   }
-
-   // Inner classes -------------------------------------------------
-}

Copied: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java (from rev 3487, trunk/tests/src/org/jboss/messaging/core/remoting/integration/test/TestSupport.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.remoting.Client;
+import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.remoting.integration.MinaConnector;
+import org.jboss.messaging.core.remoting.integration.MinaService;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
+ * 
+ * @version <tt>$Revision$</tt>
+ */
+public abstract class TestSupport extends TestCase
+{
+   // Constants -----------------------------------------------------
+
+   public static final int MANY_MESSAGES = 500;
+
+   /**
+    * Configurable by system property <code>transport.type</code>, default is
+    * TCP
+    */
+   public final static TransportType TRANSPORT;
+
+   // Attributes ----------------------------------------------------
+
+   Client client;
+
+   private MinaService service;
+
+   public static final int PORT = 9090;
+
+   // Static --------------------------------------------------------
+
+   static
+   {
+      String transportType = System.getProperty("transport.type", TCP
+            .toString());
+      TRANSPORT = TransportType.valueOf(transportType);
+      info("Default transport is " + TRANSPORT);
+   }
+
+   public static String reverse(String text)
+   {
+      // Reverse text
+      StringBuffer buf = new StringBuffer(text.length());
+      for (int i = text.length() - 1; i >= 0; i--)
+      {
+         buf.append(text.charAt(i));
+      }
+      return buf.toString();
+   }
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   void startServer(int port, TransportType transport) throws Exception
+   {
+      startServer(port, transport, false);
+   }
+
+   void startServer(int port, TransportType transport, boolean useSSL)
+         throws Exception
+   {
+      service = new MinaService("localhost", port);
+      service.start();
+   }
+   
+   void stopServer()
+   {
+      service.stop();
+   }
+
+   void startClient(int port, TransportType transport) throws Exception
+   {
+      startClient(port, transport, false);
+   }
+
+   void startClient(int port, TransportType transport, boolean useSSL)
+         throws Exception
+   {
+      client = new Client(new MinaConnector());
+      client.connect("localhost", port, transport, useSSL);
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   private static void info(String info)
+   {
+      System.out.format("### %-50s ###\n", info);
+   }
+
+   // Inner classes -------------------------------------------------
+}

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java	2007-12-13 08:03:56 UTC (rev 3496)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ClientTest.java	2007-12-13 08:30:53 UTC (rev 3497)
@@ -11,7 +11,7 @@
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.jboss.messaging.core.remoting.TransportType.TCP;
-import static org.jboss.messaging.core.remoting.integration.test.TestSupport.PORT;
+import static org.jboss.messaging.core.remoting.impl.mina.integration.test.TestSupport.PORT;
 
 import java.io.IOException;
 




More information about the jboss-cvs-commits mailing list