[hornetq-commits] JBoss hornetq SVN: r11778 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-11-28 07:48:14 -0500 (Mon, 28 Nov 2011)
New Revision: 11778

Modified:
   trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
Log:
Reduce code duplication.

Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java	2011-11-28 12:47:51 UTC (rev 11777)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java	2011-11-28 12:48:14 UTC (rev 11778)
@@ -708,9 +708,9 @@
       }
    }
 
-
-   protected final void receiveMessagesAndAck(ClientConsumer consumer, final int start, int msgCount)
-            throws HornetQException
+   protected final void
+            receiveMessages(ClientConsumer consumer, final int start, final int msgCount, final boolean ack)
+                                                                                                            throws HornetQException
    {
       for (int i = start; i < msgCount; i++)
       {
@@ -718,7 +718,8 @@
          Assert.assertNotNull("Expecting a message " + i, message);
          assertMessageBody(i, message);
          Assert.assertEquals(i, message.getIntProperty("counter").intValue());
-         message.acknowledge();
+         if (ack)
+            message.acknowledge();
       }
    }
 

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java	2011-11-28 12:47:51 UTC (rev 11777)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/BackupSyncJournalTest.java	2011-11-28 12:48:14 UTC (rev 11778)
@@ -182,7 +182,7 @@
    {
       session.start();
       ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
-      receiveMessagesAndAck(consumer, start, end);
+      receiveMessages(consumer, start, end, true);
       consumer.close();
       session.commit();
    }

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-11-28 12:47:51 UTC (rev 11777)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java	2011-11-28 12:48:14 UTC (rev 11778)
@@ -1077,17 +1077,8 @@
 
       session.start();
 
-      for (int i = 0; i < NUM_MESSAGES; i++)
-      {
-         ClientMessage message = consumer.receive(1000);
+      receiveMessages(consumer, 0, NUM_MESSAGES, false);
 
-         Assert.assertNotNull(message);
-
-         assertMessageBody(i, message);
-
-         Assert.assertEquals(i, message.getIntProperty("counter").intValue());
-      }
-
       crash(session);
 
       receiveDurableMessages(consumer);
@@ -1209,7 +1200,7 @@
       }
 
       // Should get the same ones after failover since we didn't ack
-      receiveMessagesAndAck(consumer, NUM_MESSAGES, NUM_MESSAGES * 2);
+      receiveMessages(consumer, NUM_MESSAGES, NUM_MESSAGES * 2, true);
 
       session.close();
 
@@ -1218,7 +1209,7 @@
 
    private void receiveMessages(ClientConsumer consumer) throws HornetQException
    {
-      receiveMessagesAndAck(consumer, 0, NUM_MESSAGES);
+      receiveMessages(consumer, 0, NUM_MESSAGES, true);
    }
 
    public void testSimpleSendAfterFailoverDurableTemporary() throws Exception