[jboss-cvs] JBoss Messaging SVN: r3499 - trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Dec 13 05:18:57 EST 2007


Author: jmesnil
Date: 2007-12-13 05:18:56 -0500 (Thu, 13 Dec 2007)
New Revision: 3499

Modified:
   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/TestSupport.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1195 - Optimize in-vm communication
* related tests cleanup

Modified: 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/MinaClientTest.java	2007-12-13 10:12:39 UTC (rev 3498)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaClientTest.java	2007-12-13 10:18:56 UTC (rev 3499)
@@ -6,31 +6,26 @@
  */
 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 static org.jboss.messaging.core.remoting.impl.mina.integration.test.TestSupport.PORT;
 
-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;
+import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.remoting.impl.ClientTestBase;
+import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
+import org.jboss.messaging.core.remoting.impl.mina.MinaService;
 
 /**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
  * @version <tt>$Revision$</tt>
+ *
  */
-public class MinaClientTest extends TestSupport
+public class MinaClientTest extends ClientTestBase
 {
-   private ReversePacketHandler serverPacketHandler;
 
+   private MinaService service;
+
    // Constants -----------------------------------------------------
 
    // Attributes ----------------------------------------------------
@@ -41,133 +36,38 @@
 
    // Public --------------------------------------------------------
 
-   public void testConnected() throws Exception
+   // ClientTestBase overrides --------------------------------------
+   
+   @Override
+   protected Client createClient() 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());
+      return new Client(new MinaConnector());
    }
-      
-   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
+   @Override
+   protected TransportType getTransport()
    {
-      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());
-      }
+      return TCP;
    }
 
-   public void testSendOneWayWithCallbackHandler() throws Exception
+   @Override
+   protected void startServer() 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);
+      service = new MinaService("localhost", PORT);
+      service.start();
    }
 
-   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
+   protected void stopServer()
    {
-      startServer(TestSupport.PORT, TRANSPORT);
-      startClient(TestSupport.PORT, TRANSPORT);
-
-      serverPacketHandler = new ReversePacketHandler();
-      PacketDispatcher.server.register(serverPacketHandler);
+      service.stop();
    }
+   
+   // Package protected ---------------------------------------------
 
-   @Override
-   protected void tearDown() throws Exception
-   {
-      PacketDispatcher.server.unregister(serverPacketHandler.getID());
+   // Protected -----------------------------------------------------
 
-      client.disconnect();
-      stopServer();
-   }
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
 }

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java	2007-12-13 10:12:39 UTC (rev 3498)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/TestSupport.java	2007-12-13 10:18:56 UTC (rev 3499)
@@ -6,49 +6,24 @@
  */
 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.impl.mina.MinaConnector;
-import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  * 
  * @version <tt>$Revision$</tt>
  */
-public abstract class TestSupport extends TestCase
+public abstract class TestSupport
 {
    // 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 ----------------------------------------------------
 
-   protected 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
@@ -64,45 +39,11 @@
 
    // Public --------------------------------------------------------
 
-   protected void startServer(int port, TransportType transport) throws Exception
-   {
-      startServer(port, transport, false);
-   }
-
-   protected void startServer(int port, TransportType transport, boolean useSSL)
-         throws Exception
-   {
-      service = new MinaService("localhost", port);
-      service.start();
-   }
-   
-   protected void stopServer()
-   {
-      service.stop();
-   }
-
-   protected void startClient(int port, TransportType transport) throws Exception
-   {
-      startClient(port, transport, false);
-   }
-
-   protected 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 -------------------------------------------------
 }




More information about the jboss-cvs-commits mailing list