[hornetq-commits] JBoss hornetq SVN: r8169 - trunk/tests/src/org/hornetq/tests/integration/cluster/failover.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2009-10-30 06:56:29 -0400 (Fri, 30 Oct 2009)
New Revision: 8169

Modified:
   trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
Log:
fixed asynchronous failover test

* reset TestRunner failed status to run it for each iteration of runTest()
* modified assertion in the non-tx test to allow a "gap" in the message counters (if
  messages are missing or duplicated)

Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java	2009-10-30 02:01:08 UTC (rev 8168)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java	2009-10-30 10:56:29 UTC (rev 8169)
@@ -13,8 +13,8 @@
 
 package org.hornetq.tests.integration.cluster.failover;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -30,7 +30,6 @@
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.remoting.FailureListener;
 import org.hornetq.core.remoting.RemotingConnection;
-import org.hornetq.core.remoting.impl.invm.TransportConstants;
 
 /**
  * A MultiThreadFailoverTest
@@ -108,6 +107,11 @@
       {
          failed = true;
       }
+      
+      void reset()
+      {
+         failed = false;
+      }
    }
 
    private void runTest(final TestRunner runnable) throws Exception
@@ -177,6 +181,7 @@
             if (i != numIts - 1)
             {
                tearDown();
+               runnable.reset();
                setUp();
             }
          }
@@ -224,6 +229,7 @@
                }
                catch (HornetQException e)
                {
+                  log.info("exception when sending message with counter " + i);
                   assertEquals(e.getCode(), HornetQException.UNBLOCKED);
 
                   retry = true;
@@ -236,7 +242,9 @@
 
          session.start();
 
+         List<Integer> counts = new ArrayList<Integer>(1000);
          int lastCount = -1;
+         boolean counterGap = false;
          while (true)
          {
             ClientMessage message = consumer.receive(500);
@@ -246,12 +254,26 @@
                break;
             }
 
-            // There may be some missing or duplicate messages - but the order should be correct
-
+            // messages must remain ordered but there could be a "jump" if messages
+            // are missing or duplicated
             int count = (Integer)message.getProperty("counter");
-
-            assertTrue("count:" + count + " last count:" + lastCount, count >= lastCount);
-
+            counts.add(count);
+            if (count != lastCount + 1)
+            {
+               if (counterGap)
+               {
+                  fail("got a another counter gap at " + count + ": " + counts);
+               }
+               else
+               {
+                  if (lastCount != -1)
+                  {
+                     log.info("got first counter gap at " + count);                  
+                     counterGap = true;
+                  }
+               }
+            }
+            
             lastCount = count;
 
             message.acknowledge();