[hornetq-commits] JBoss hornetq SVN: r11803 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-11-30 16:51:23 -0500 (Wed, 30 Nov 2011)
New Revision: 11803

Modified:
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java
Log:
JBPAPP-7606 - rollback here shouldn't ack the last received message

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java	2011-11-30 20:29:47 UTC (rev 11802)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java	2011-11-30 21:51:23 UTC (rev 11803)
@@ -233,16 +233,15 @@
       consumer = session.createConsumer(ADDRESS);
       msg = consumer.receive(1000);
       Assert.assertNotNull(msg);
-      Assert.assertEquals(2, msg.getDeliveryCount());
+      Assert.assertEquals(strictUpdate ? 1 : 2, msg.getDeliveryCount());
       session.close();
    }
 
-
    public void testInfiniteDedeliveryMessageOnPersistent() throws Exception
    {
       internaltestInfiniteDedeliveryMessageOnPersistent(false);
    }
-   
+
    private void internaltestInfiniteDedeliveryMessageOnPersistent(final boolean strict) throws Exception
    {
       setUp(strict);
@@ -255,9 +254,8 @@
       session.commit();
       session.close();
 
-      
       int expectedCount = 1;
-      for (int i = 0 ; i < 700; i++)
+      for (int i = 0; i < 700; i++)
       {
          session = factory.createSession(false, false, false);
          session.start();
@@ -277,10 +275,10 @@
 
       factory.close();
       server.stop();
-      
+
       setUp(false);
-      
-      for (int i = 0 ; i < 700; i++)
+
+      for (int i = 0; i < 700; i++)
       {
          session = factory.createSession(false, false, false);
          session.start();
@@ -293,27 +291,26 @@
 
       server.stop();
 
-      
-      JournalImpl journal = new JournalImpl(server.getConfiguration().getJournalFileSize(), 
-                                            2, 
+      JournalImpl journal = new JournalImpl(server.getConfiguration().getJournalFileSize(),
+                                            2,
                                             0,
-                                            0, 
-                                            new NIOSequentialFileFactory(server.getConfiguration().getJournalDirectory()),
+                                            0,
+                                            new NIOSequentialFileFactory(server.getConfiguration()
+                                                                               .getJournalDirectory()),
                                             "hornetq-data",
                                             "hq",
                                             1);
-      
-      
+
       final AtomicInteger updates = new AtomicInteger();
-      
+
       journal.start();
       journal.load(new LoaderCallback()
       {
-         
+
          public void failedTransaction(long transactionID, List<RecordInfo> records, List<RecordInfo> recordsToDelete)
          {
          }
-         
+
          public void updateRecord(RecordInfo info)
          {
             if (info.userRecordType == JournalStorageManager.UPDATE_DELIVERY_COUNT)
@@ -321,23 +318,22 @@
                updates.incrementAndGet();
             }
          }
-         
+
          public void deleteRecord(long id)
          {
          }
-         
+
          public void addRecord(RecordInfo info)
          {
          }
-         
+
          public void addPreparedTransaction(PreparedTransactionInfo preparedTransaction)
          {
          }
       });
-      
+
       journal.stop();
-      
-      
+
       assertEquals(7, updates.get());
 
    }