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

Author: borges Date: 2012-03-07 09:02:01 -0500 (Wed, 07 Mar 2012) New Revision: 12260 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java Log: Fix: retryInterval should always be positive Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackAutoTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -61,25 +61,25 @@ locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ((ServerLocatorInternal)locator).setIdentity("testAutoFailback"); - + locator.setIdentity("testAutoFailback"); + ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); final CountDownLatch latch = new CountDownLatch(1); ClientSession session = sendAndConsume(sf, true); - + System.out.println(locator.getTopology().describe()); CountDownSessionFailureListener listener = new CountDownSessionFailureListener(latch); session.addFailureListener(listener); - + liveServer.crash(); - + assertTrue(latch.await(5, TimeUnit.SECONDS)); - + log.info("backup (nowLive) topology = " + backupServer.getServer().getClusterManager().getDefaultConnection().getTopology().describe()); - + log.info("Server Crash!!!"); ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS); @@ -93,8 +93,8 @@ verifyMessageOnServer(1, 1); System.out.println(locator.getTopology().describe()); - + session.removeFailureListener(listener); final CountDownLatch latch2 = new CountDownLatch(1); @@ -105,9 +105,9 @@ log.info("******* starting live server back"); liveServer.start(); - + Thread.sleep(1000); - + System.out.println("After failback: " + locator.getTopology().describe()); assertTrue(latch2.await(5, TimeUnit.SECONDS)); @@ -159,7 +159,7 @@ locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - + ClientSession session = sendAndConsume(sf, true); CountDownSessionFailureListener listener = new CountDownSessionFailureListener(); @@ -184,7 +184,7 @@ log.info("restarting live node now"); liveServer.start(); - + assertTrue(listener.getLatch().await(5, TimeUnit.SECONDS)); message = session.createMessage(true); @@ -235,7 +235,9 @@ backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(liveConnector.getName()); - ClusterConnectionConfiguration cccLive = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, + ClusterConnectionConfiguration cccLive = + new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), 10, false, false, 1, + 1, staticConnectors, false); backupConfig.getClusterConfigurations().add(cccLive); backupServer = createTestableServer(backupConfig); @@ -249,7 +251,8 @@ liveConfig.setClustered(true); List<String> pairs = new ArrayList<String>(); pairs.add(backupConnector.getName()); - ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1, + ClusterConnectionConfiguration ccc0 = + new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), 10, false, false, 1, 1, pairs, false); liveConfig.getClusterConfigurations().add(ccc0); liveConfig.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); @@ -311,7 +314,7 @@ } ClientMessage message3 = consumer.receiveImmediate(); - + consumer.close(); Assert.assertNull(message3); Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -125,7 +125,9 @@ backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(liveConnector.getName()); - ClusterConnectionConfiguration cccLive = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, + ClusterConnectionConfiguration cccLive = + new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), 10, false, false, 1, + 1, staticConnectors, false); backupConfig.getClusterConfigurations().add(cccLive); backupConfig.setAllowAutoFailBack(false); @@ -139,7 +141,8 @@ liveConfig.setClustered(true); List<String> pairs = new ArrayList<String>(); pairs.add(backupConnector.getName()); - ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1, + ClusterConnectionConfiguration ccc0 = + new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), 10, false, false, 1, 1, pairs, false); liveConfig.getClusterConfigurations().add(ccc0); liveConfig.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -191,7 +191,7 @@ ClusterConnectionConfiguration ccc1 = new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), - -1, + 10, false, false, 1, @@ -234,7 +234,7 @@ ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), - -1, + 10, false, false, 1, Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SecurityFailoverTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -124,10 +124,8 @@ backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(liveConnector.getName()); - ClusterConnectionConfiguration cccLive = new ClusterConnectionConfiguration("cluster1", - "jms", - backupConnector.getName(), - -1, + ClusterConnectionConfiguration cccLive = + new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), 10, false, false, 1, Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -144,7 +144,8 @@ TransportConfiguration backupConnector = createTransportConfiguration(isNetty(), false, generateParams(nodeid, isNetty())); ClusterConnectionConfiguration ccc1 = - new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), -1, false, false, 1, 1, + new ClusterConnectionConfiguration("cluster1", "jms", backupConnector.getName(), 10, false, false, 1, + 1, staticConnectors, false); config1.getClusterConfigurations().add(ccc1); config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); @@ -169,7 +170,7 @@ config0.setSharedStore(true); config0.setClustered(true); ClusterConnectionConfiguration ccc0 = - new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1, + new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), 10, false, false, 1, 1, null, false); config0.getClusterConfigurations().add(ccc0); config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2012-03-07 12:49:27 UTC (rev 12259) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2012-03-07 14:02:01 UTC (rev 12260) @@ -363,7 +363,7 @@ ClusterConnectionConfiguration cccBackup = new ClusterConnectionConfiguration("cluster1", "jms", backuptc.getName(), - -1, + 10, false, false, 1, @@ -406,7 +406,7 @@ ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", livetc.getName(), - -1, + 10, false, false, 1,