Author: ataylor Date: 2010-11-04 11:05:08 -0400 (Thu, 04 Nov 2010) New Revision: 9845 Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java Log: test fix Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-11-04 08:13:02 UTC (rev 9844) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-11-04 15:05:08 UTC (rev 9845) @@ -1429,8 +1429,6 @@ configuration.getConnectorConfigurations().put(liveConfig.getName(), liveConfig); TransportConfiguration backupConfig = createTransportConfiguration(netty, false, generateParams(node, netty)); configuration.getConnectorConfigurations().put(backupConfig.getName(), backupConfig); - ArrayList<String> staticConnectors = new ArrayList<String>(); - staticConnectors.add(liveConfig.getName()); HornetQServer server; @@ -1651,8 +1649,7 @@ final int maxHops, final boolean netty, final int nodeFrom, - final int[] nodesTo, - final int[] backupsTo) + final int[] nodesTo) { HornetQServer serverFrom = servers[nodeFrom]; Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java 2010-11-04 08:13:02 UTC (rev 9844) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java 2010-11-04 15:05:08 UTC (rev 9845) @@ -479,8 +479,7 @@ 1, isNetty(), 0, - new int[] { 1, 2, 3, 4 }, - new int[] { 6, 7, 8, 9 }); + new int[] { 1, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster1", "queues", @@ -488,8 +487,7 @@ 1, isNetty(), 1, - new int[] { 0, 2, 3, 4 }, - new int[] { 5, 7, 8, 9 }); + new int[] { 0, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster2", "queues", @@ -497,8 +495,7 @@ 1, isNetty(), 2, - new int[] { 0, 1, 3, 4 }, - new int[] { 5, 6, 8, 9 }); + new int[] { 0, 1, 3, 4 }); setupClusterConnectionWithBackups("cluster3", "queues", @@ -506,8 +503,7 @@ 1, isNetty(), 3, - new int[] { 0, 1, 2, 4 }, - new int[] { 5, 6, 7, 9 }); + new int[] { 0, 1, 2, 4 }); setupClusterConnectionWithBackups("cluster4", "queues", @@ -515,8 +511,7 @@ 1, isNetty(), 4, - new int[] { 0, 1, 2, 3 }, - new int[] { 5, 6, 7, 8 }); + new int[] { 0, 1, 2, 3 }); // The backups @@ -526,8 +521,7 @@ 1, isNetty(), 5, - new int[] { 1, 2, 3, 4 }, - new int[] { 6, 7, 8, 9 }); + new int[] {0, 1, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster1", "queues", @@ -535,8 +529,7 @@ 1, isNetty(), 6, - new int[] { 0, 2, 3, 4 }, - new int[] { 5, 7, 8, 9 }); + new int[] {0, 1, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster2", "queues", @@ -544,8 +537,7 @@ 1, isNetty(), 7, - new int[] { 0, 1, 3, 4 }, - new int[] { 5, 6, 8, 9 }); + new int[] { 0, 1, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster3", "queues", @@ -553,8 +545,7 @@ 1, isNetty(), 8, - new int[] { 0, 1, 2, 4 }, - new int[] { 5, 6, 7, 9 }); + new int[] { 0, 1, 2, 3, 4 }); setupClusterConnectionWithBackups("cluster4", "queues", @@ -562,8 +553,7 @@ 1, isNetty(), 9, - new int[] { 0, 1, 2, 3 }, - new int[] { 5, 6, 7, 8 }); + new int[] { 0, 1, 2, 3, 4 }); } @Override Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-11-04 08:13:02 UTC (rev 9844) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-11-04 15:05:08 UTC (rev 9845) @@ -45,7 +45,7 @@ setupClusterConnection("cluster0", "queues", false, 1, isNetty(), 0, 1); - setupClusterConnectionWithBackups("cluster1", "queues", false, 1, isNetty(), 1, new int[] { 0 }, new int[] { 2 }); + setupClusterConnectionWithBackups("cluster1", "queues", false, 1, isNetty(), 1, new int[] { 0 }); setupClusterConnection("cluster2", "queues", false, 1, isNetty(), 2, 1); @@ -138,7 +138,7 @@ setupClusterConnection("cluster0", "queues", false, 1, isNetty(), 0, 1); - setupClusterConnectionWithBackups("cluster1", "queues", false, 1, isNetty(), 1, new int[] { 0 }, new int[] { 2 }); + setupClusterConnectionWithBackups("cluster1", "queues", false, 1, isNetty(), 1, new int[] { 0 }); setupClusterConnection("cluster2", "queues", false, 1, isNetty(), 2, 1); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-11-04 08:13:02 UTC (rev 9844) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-11-04 15:05:08 UTC (rev 9845) @@ -271,7 +271,7 @@ setupBackupServer(2, 1, true, isShared(), true); setupBackupServer(3, 1, true, isShared(), true); - setupClusterConnectionWithBackups("test", "test", false, 1, true, 1, new int[] { 3 }, new int[] { 2 }); + setupClusterConnectionWithBackups("test", "test", false, 1, true, 1, new int[] { 3 }); AddressSettings as = new AddressSettings(); as.setRedistributionDelay(0); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java 2010-11-04 08:13:02 UTC (rev 9844) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/StaticClusterWithBackupFailoverTest.java 2010-11-04 15:05:08 UTC (rev 9845) @@ -41,8 +41,7 @@ 1, isNetty(), 0, - new int[] { 1, 2 }, - new int[] { 4, 5 }); + new int[] { 1, 2 }); setupClusterConnectionWithBackups("cluster1", "queues", @@ -50,8 +49,7 @@ 1, isNetty(), 1, - new int[] { 0, 2 }, - new int[] { 3, 5 }); + new int[] { 0, 2 }); setupClusterConnectionWithBackups("cluster2", "queues", @@ -59,8 +57,7 @@ 1, isNetty(), 2, - new int[] { 0, 1 }, - new int[] { 3, 4 }); + new int[] { 0, 1 }); setupClusterConnectionWithBackups("cluster0", "queues", @@ -68,8 +65,7 @@ 1, isNetty(), 3, - new int[] { 1, 2 }, - new int[] { 4, 5 }); + new int[] { 1, 2 }); setupClusterConnectionWithBackups("cluster1", "queues", @@ -77,8 +73,7 @@ 1, isNetty(), 4, - new int[] { 0, 2 }, - new int[] { 3, 5 }); + new int[] { 0, 2 }); setupClusterConnectionWithBackups("cluster2", "queues", @@ -86,8 +81,7 @@ 1, isNetty(), 5, - new int[] { 0, 1 }, - new int[] { 3, 4 }); + new int[] { 0, 1 }); } @Override