[jboss-cvs] JBoss Messaging SVN: r6078 - trunk/tests/src/org/jboss/messaging/tests/integration/client.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2009-03-13 11:31:21 -0400 (Fri, 13 Mar 2009)
New Revision: 6078

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientEndToEndTest.java
Log:
some end to end tests - more to follow

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientEndToEndTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientEndToEndTest.java	2009-03-13 14:21:50 UTC (rev 6077)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientEndToEndTest.java	2009-03-13 15:31:21 UTC (rev 6078)
@@ -1130,13 +1130,98 @@
       }
    }
 
-  /* public void testTempQueueGetsDeleted() throws Exception
+   public void testSendDeliveryOrderOnCommit() throws Exception
    {
       MessagingService messagingService = createService(false);
       try
       {
          messagingService.start();
          ClientSessionFactory cf = createInVMFactory();
+         ClientSession sendSession = cf.createSession(false, false, true);
+         ClientProducer cp = sendSession.createProducer(addressA);
+         int numMessages = 1000;
+         sendSession.createQueue(addressA, queueA, false);
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage cm = sendSession.createClientMessage(false);
+            cm.getBody().writeInt(i);
+            cp.send(cm);
+            if (i % 10 == 0)
+            {
+               sendSession.commit();
+            }
+            sendSession.commit();
+         }
+         ClientConsumer c = sendSession.createConsumer(queueA);
+         sendSession.start();
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage cm = c.receive(5000);
+            assertNotNull(cm);
+            assertEquals(i, cm.getBody().readInt());
+         }
+      }
+      finally
+      {
+         if (messagingService.isStarted())
+         {
+            messagingService.stop();
+         }
+      }
+   }
+
+   public void testReceiveDeliveryOrderOnRollback() throws Exception
+   {
+      MessagingService messagingService = createService(false);
+      try
+      {
+         messagingService.start();
+         ClientSessionFactory cf = createInVMFactory();
+         ClientSession sendSession = cf.createSession(false, true, false);
+         ClientProducer cp = sendSession.createProducer(addressA);
+         int numMessages = 1000;
+         sendSession.createQueue(addressA, queueA, false);
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage cm = sendSession.createClientMessage(false);
+            cm.getBody().writeInt(i);
+            cp.send(cm);
+         }
+         ClientConsumer c = sendSession.createConsumer(queueA);
+         sendSession.start();
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage cm = c.receive(5000);
+            assertNotNull(cm);
+            cm.acknowledge();
+            assertEquals(i, cm.getBody().readInt());
+         }
+         sendSession.rollback();
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage cm = c.receive(5000);
+            assertNotNull(cm);
+            cm.acknowledge();
+            assertEquals(i, cm.getBody().readInt());
+         }
+         sendSession.close();
+      }
+      finally
+      {
+         if (messagingService.isStarted())
+         {
+            messagingService.stop();
+         }
+      }
+   }
+
+   /* public void testTempQueueGetsDeleted() throws Exception
+   {
+      MessagingService messagingService = createService(false);
+      try
+      {
+         messagingService.start();
+         ClientSessionFactory cf = createInVMFactory();
          ClientSession session = cf.createSession(false, true, true);
          session.createQueue(addressA, queueA, false, true);
          session.close();