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

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

Author: clebert.suconic at jboss.com
Date: 2009-03-18 18:53:44 -0400 (Wed, 18 Mar 2009)
New Revision: 6111

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
Log:
Tweak

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java	2009-03-18 21:49:31 UTC (rev 6110)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java	2009-03-18 22:53:44 UTC (rev 6111)
@@ -361,7 +361,6 @@
       testChunks(false, true, true, false, false, true, 100, 50000, RECEIVE_WAIT_TIME, 0);
    }
 
-
    public void testSendfileMessageXA() throws Exception
    {
       testChunks(true, true, true, false, false, true, 100, 50000, RECEIVE_WAIT_TIME, 0);
@@ -593,43 +592,47 @@
       }
 
    }
-   
+
+   public void testSendRollbackXA() throws Exception
+   {
+      internalTestSendRollback(true);
+   }
+
    public void testSendRollback() throws Exception
    {
+      internalTestSendRollback(false);
+   }
+
+   private void internalTestSendRollback(final boolean isXA) throws Exception
+   {
       clearData();
-      
-      boolean isXA = false;
-      
+
       messagingService = createService(true);
 
       messagingService.start();
 
       ClientSessionFactory sf = createInVMFactory();
-     
+
       ClientSession session = sf.createSession(isXA, false, false);
-      
+
       session.createQueue(ADDRESS, ADDRESS, true);
-      
+
       Xid xid = null;
-      
+
       if (isXA)
       {
          xid = newXID();
          session.start(xid, XAResource.TMNOFLAGS);
       }
-      
-      
+
       ClientProducer producer = session.createProducer(ADDRESS);
 
-      
       Message clientFile = createLargeClientMessage(session, 50000, false);
 
       for (int i = 0; i < 1; i++)
       {
          producer.send(clientFile);
       }
-      
-      
 
       if (isXA)
       {
@@ -641,27 +644,25 @@
       {
          session.rollback();
       }
-      
+
       session.close();
-      
+
       validateNoFilesOnLargeDir();
-      
+
       messagingService.stop();
 
    }
 
-   
    public void testSimpleRollback() throws Exception
    {
       simpleRollbackInternalTest(false);
    }
-   
+
    public void testSimpleRollbackXA() throws Exception
    {
       simpleRollbackInternalTest(true);
    }
-   
-   
+
    public void simpleRollbackInternalTest(boolean isXA) throws Exception
    {
       // there are two bindings.. one is ACKed, the other is not, the server is restarted
@@ -679,9 +680,9 @@
          ClientSessionFactory sf = createInVMFactory();
 
          ClientSession session = sf.createSession(isXA, false, false);
-         
+
          Xid xid = null;
-         
+
          if (isXA)
          {
             xid = newXID();
@@ -694,15 +695,15 @@
 
          session.start();
 
-         log.info ("Session started");
-         
+         log.info("Session started");
+
          ClientProducer producer = session.createProducer(ADDRESS);
 
          ClientConsumer consumer = session.createConsumer(ADDRESS);
-         
+
          for (int n = 0; n < 10; n++)
          {
-            Message clientFile = createLargeClientMessage(session, numberOfIntegers, n%2 == 0);
+            Message clientFile = createLargeClientMessage(session, numberOfIntegers, n % 2 == 0);
 
             producer.send(clientFile);
 
@@ -901,7 +902,7 @@
          for (int i = 0; i < 100; i++)
          {
             ClientMessage message2 = consumer.receive(RECEIVE_WAIT_TIME);
-            
+
             log.info("got message " + i);
 
             assertNotNull(message2);