[hornetq-commits] JBoss hornetq SVN: r10971 - branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-07-13 02:08:34 -0400 (Wed, 13 Jul 2011)
New Revision: 10971

Modified:
   branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java
Log:
fixing a test

Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java	2011-07-12 22:11:28 UTC (rev 10970)
+++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java	2011-07-13 06:08:34 UTC (rev 10971)
@@ -12,7 +12,6 @@
  */
 package org.hornetq.tests.integration.cluster.failover;
 
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -21,11 +20,6 @@
 import org.hornetq.api.core.HornetQException;
 import org.hornetq.api.core.Message;
 import org.hornetq.api.core.SimpleString;
-import org.hornetq.core.client.impl.Topology;
-import org.hornetq.core.remoting.FailureListener;
-import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.cluster.MessageFlowRecord;
-import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl;
 import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
 import org.hornetq.spi.core.protocol.RemotingConnection;
 import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase;
@@ -39,7 +33,7 @@
 
    public void testGroupingLocalHandlerFails() throws Exception
    {
-     setupBackupServer(2, 0, isFileStorage(), isSharedServer(), isNetty());
+      setupBackupServer(2, 0, isFileStorage(), isSharedServer(), isNetty());
 
       setupLiveServer(0, isFileStorage(), isSharedServer(), isNetty());
 
@@ -57,7 +51,6 @@
 
       setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 2);
 
-
       try
       {
          startServers(2, 0, 1);
@@ -79,7 +72,7 @@
          waitForBindings(0, "queues.testaddress", 1, 1, true);
          waitForBindings(1, "queues.testaddress", 1, 1, true);
 
-         waitForTopology(servers[1], 3);
+         waitForTopology(servers[1], 2);
 
          sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1"));
 
@@ -88,7 +81,7 @@
          closeSessionFactory(0);
 
          servers[0].stop(true);
-         
+
          waitForServerRestart(2);
 
          setupSessionFactory(2, isNetty());
@@ -129,14 +122,12 @@
 
       setupClusterConnection("cluster0", "queues", false, 1, isNetty(), 2, 1);
 
-
       setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 0);
 
       setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 1);
 
       setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 2);
 
-
       try
       {
          startServers(2, 0, 1);
@@ -162,9 +153,8 @@
          waitForBindings(0, "queues.testaddress", 1, 1, true);
          waitForBindings(1, "queues.testaddress", 1, 1, true);
 
-         waitForTopology(servers[1], 3);
+         waitForTopology(servers[1], 2);
 
-
          sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id1"));
          sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id2"));
          sendWithProperty(0, "queues.testaddress", 10, false, Message.HDR_GROUP_ID, new SimpleString("id3"));