[hornetq-commits] JBoss hornetq SVN: r12293 - in trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration: cluster/distribution and 1 other directories.

Author: borges Date: 2012-03-13 08:04:31 -0400 (Tue, 13 Mar 2012) New Revision: 12293 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java Log: HORNETQ-720 HORNETQ-776 Fix test logic Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2012-03-13 07:59:26 UTC (rev 12292) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2012-03-13 12:04:31 UTC (rev 12293) @@ -24,7 +24,6 @@ import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; @@ -60,15 +59,18 @@ Configuration conf = createDefaultConfig(); conf.setSecurityEnabled(false); - conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName())); + conf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); server = createServer(false, conf); jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); - cf1 = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - - cf2 = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF,new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf1 = + HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, + new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + cf2 = + HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, + new TransportConfiguration(INVM_CONNECTOR_FACTORY)); } @Override Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2012-03-13 07:59:26 UTC (rev 12292) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2012-03-13 12:04:31 UTC (rev 12293) @@ -538,7 +538,7 @@ throw new IllegalArgumentException("No sf at " + node); } - ClientSession session = sf.createSession(false, true, true); + ClientSession session = addClientSession(sf.createSession(false, true, true)); String filterString = null; @@ -603,7 +603,7 @@ } catch (Exception e) { - // Proxy the failure and print a dump into System.out, so it is captured by Hudson reports + // Proxy the failure and print a dump into System.out, so it is captured by Jenkins reports e.printStackTrace(); System.out.println(UnitTestCase.threadDump(" - fired by ClusterTestBase::addConsumer")); @@ -1528,15 +1528,15 @@ serverToTC = new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY, params); } - locators[node] = HornetQClient.createServerLocatorWithHA(serverToTC); + locators[node] = addServerLocator(HornetQClient.createServerLocatorWithHA(serverToTC)); locators[node].setRetryInterval(100); locators[node].setRetryIntervalMultiplier(1d); locators[node].setReconnectAttempts(-1); locators[node].setBlockOnNonDurableSend(blocking); locators[node].setBlockOnDurableSend(blocking); - ((ServerLocatorInternal)locators[node]).setIdentity("TestClientConnector,live=" + node + ",backup=" + backupNode); + final String identity = "TestClientConnector,live=" + node + ",backup=" + backupNode; + ((ServerLocatorInternal)locators[node]).setIdentity(identity); - addServerLocator(locators[node]); ClientSessionFactory sf = createSessionFactory(locators[node]); sfs[node] = sf; } @@ -2056,8 +2056,8 @@ waitForServer(servers[node]); } - + } protected void stopClusterConnections(final int... nodes) throws Exception Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java 2012-03-13 07:59:26 UTC (rev 12292) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/QuorumFailOverTest.java 2012-03-13 12:04:31 UTC (rev 12293) @@ -13,12 +13,12 @@ public void testQuorumVoting() throws Exception { - + int[] liveServerIDs = new int[] { 1, 2, 3 }; setupCluster(); startServers(0, 1, 2, 3, 4, 5); - for (int i = 0; i < 3; i++) + for (int i : liveServerIDs) { waitForTopology(servers[i], 3, 3); } @@ -27,13 +27,13 @@ waitForFailoverTopology(4, 0, 1, 2); waitForFailoverTopology(5, 0, 1, 2); - for (int i : new int[] { 0, 1, 2 }) + for (int i : liveServerIDs) { setupSessionFactory(i, i + 3, isNetty(), false); + createQueue(i, QUEUES_TESTADDRESS, QUEUE_NAME, null, true); + addConsumer(i, i, QUEUE_NAME, null); } - createQueue(0, QUEUES_TESTADDRESS, QUEUE_NAME, null, true); - addConsumer(0, 0, QUEUE_NAME, null); waitForBindings(0, QUEUES_TESTADDRESS, 1, 1, true); final TopologyListener liveTopologyListener = new TopologyListener("LIVE-1"); @@ -50,9 +50,9 @@ waitForBindings(3, QUEUES_TESTADDRESS, 1, 1, true); - assertTrue(servers[3].waitForInitialization(10, TimeUnit.SECONDS)); + assertTrue(servers[3].waitForInitialization(2, TimeUnit.SECONDS)); assertFalse("3 should have failed over ", servers[3].getConfiguration().isBackup()); - servers[1].stop(); + failNode(1); assertFalse("4 should have failed over ", servers[4].getConfiguration().isBackup()); }