Author: borges Date: 2011-07-05 12:10:20 -0400 (Tue, 05 Jul 2011) New Revision: 10924 Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java Log: Clean up Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-07-05 16:09:43 UTC (rev 10923) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-07-05 16:10:20 UTC (rev 10924) @@ -59,7 +59,7 @@ private static final Logger log = Logger.getLogger(FailoverTest.class); private ServerLocator locator; - + private ClientSessionFactoryInternal sf; // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -137,7 +137,7 @@ locator.setAckBatchSize(0); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); + sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); ClientSession session = createSession(sf, true, true); @@ -210,13 +210,9 @@ public void testNonTransacted() throws Exception { - ClientSessionFactoryInternal sf; - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); - sf = createSessionFactoryAndWaitForTopology(locator, 2); + createSessionFactory(); ClientSession session = createSession(sf, true, true); @@ -270,14 +266,19 @@ Assert.assertEquals(0, sf.numConnections()); } - public void testConsumeTransacted() throws Exception + private void createSessionFactory() throws Exception { locator.setBlockOnNonDurableSend(true); locator.setBlockOnDurableSend(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); + } + public void testConsumeTransacted() throws Exception + { + createSessionFactory(); + ClientSession session = createSession(sf, false, false); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -362,7 +363,7 @@ locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); // Crash live server crash(); @@ -414,12 +415,8 @@ public void testTransactedMessagesSentSoRollback() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, false, false); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -477,12 +474,8 @@ */ public void testTransactedMessagesSentSoRollbackAndContinueWork() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, false, false); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -548,12 +541,8 @@ public void testTransactedMessagesNotSentSoNoRollback() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, false, false); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -620,12 +609,8 @@ public void testTransactedMessagesWithConsumerStartedBeforeFailover() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, false, false); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -700,12 +685,8 @@ public void testTransactedMessagesConsumedSoRollback() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session1 = createSession(sf, false, false); session1.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -774,12 +755,8 @@ public void testTransactedMessagesNotConsumedSoNoRollback() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session1 = createSession(sf, false, false); session1.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -860,12 +837,8 @@ public void testXAMessagesSentSoRollbackOnEnd() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, true, false, false); Xid xid = new XidImpl("uhuhuhu".getBytes(), 126512, "auhsduashd".getBytes()); @@ -921,12 +894,8 @@ public void testXAMessagesSentSoRollbackOnPrepare() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, true, false, false); Xid xid = new XidImpl("uhuhuhu".getBytes(), 126512, "auhsduashd".getBytes()); @@ -985,12 +954,8 @@ // This might happen if 1PC optimisation kicks in public void testXAMessagesSentSoRollbackOnCommit() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, true, false, false); Xid xid = new XidImpl("uhuhuhu".getBytes(), 126512, "auhsduashd".getBytes()); @@ -1048,12 +1013,8 @@ public void testXAMessagesNotSentSoNoRollbackOnCommit() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, true, false, false); Xid xid = new XidImpl("uhuhuhu".getBytes(), 126512, "auhsduashd".getBytes()); @@ -1128,12 +1089,8 @@ public void testXAMessagesConsumedSoRollbackOnEnd() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session1 = createSession(sf, false, false); session1.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -1204,12 +1161,8 @@ public void testXAMessagesConsumedSoRollbackOnPrepare() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session1 = createSession(sf, false, false); session1.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -1283,11 +1236,7 @@ // 1PC optimisation public void testXAMessagesConsumedSoRollbackOnCommit() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); - - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + createSessionFactory(); ClientSession session1 = createSession(sf, false, false); session1.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -1366,7 +1315,7 @@ locator.setBlockOnNonDurableSend(true); locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); ClientSession session = sendAndConsume(sf, true); @@ -1391,12 +1340,8 @@ public void testFailoverMultipleSessionsWithConsumers() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - final int numSessions = 5; final int numConsumersPerSession = 5; @@ -1488,11 +1433,7 @@ */ public void testFailWithBrowser() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); - - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + createSessionFactory(); ClientSession session = createSession(sf, true, true); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -1558,12 +1499,8 @@ public void testFailThenReceiveMoreMessagesAfterFailover() throws Exception { - locator.setBlockOnNonDurableSend(true); - locator.setBlockOnDurableSend(true); - locator.setReconnectAttempts(-1); + createSessionFactory(); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = createSession(sf, true, true); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -1635,7 +1572,7 @@ locator.setBlockOnDurableSend(true); locator.setBlockOnAcknowledge(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); ClientSession session = createSession(sf, true, true, 0); @@ -1738,7 +1675,7 @@ locator.setBlockOnDurableSend(true); locator.setBlockOnAcknowledge(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); ClientSession session = createSession(sf, true, true, 0); @@ -1800,7 +1737,7 @@ locator.setBlockOnDurableSend(true); locator.setBlockOnAcknowledge(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); + sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); // Add an interceptor to delay the send method so we can get time to cause failover before it returns @@ -1864,7 +1801,7 @@ locator.setReconnectAttempts(-1); locator.setBlockOnAcknowledge(true); - final ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final ClientSession session = createSession(sf, false, false); @@ -2021,7 +1958,7 @@ locator.setBlockOnDurableSend(true); locator.setBlockOnAcknowledge(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final ClientSession session = createSession(sf, false, false); @@ -2148,7 +2085,7 @@ locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final CountDownLatch latch = new CountDownLatch(1); class MyListener implements SessionFailureListener @@ -2202,7 +2139,7 @@ locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final CountDownLatch latch = new CountDownLatch(1); class MyListener implements SessionFailureListener @@ -2258,7 +2195,7 @@ locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final CountDownLatch latch = new CountDownLatch(1); class MyListener implements SessionFailureListener @@ -2330,7 +2267,7 @@ locator.setBlockOnDurableSend(true); locator.setFailoverOnInitialConnection(true); locator.setReconnectAttempts(-1); - ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); + sf = createSessionFactoryAndWaitForTopology(locator, 2); final CountDownLatch latch = new CountDownLatch(1); class MyListener implements SessionFailureListener Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-05 16:09:43 UTC (rev 10923) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-05 16:10:20 UTC (rev 10924) @@ -286,57 +286,6 @@ System.out.println("sf.getBackupConnector() = " + sf.getBackupConnector()); } - protected void waitForBackup(long seconds) - { - long time = System.currentTimeMillis(); - long toWait = seconds * 1000; - while (!backupServer.isInitialised()) - { - try - { - Thread.sleep(100); - } - catch (InterruptedException e) - { - //ignore - } - if (backupServer.isInitialised()) - { - break; - } - else if (System.currentTimeMillis() > (time + toWait)) - { - fail("backup server never started"); - } - } - } - - protected void waitForBackup(long seconds, TestableServer server) - { - long time = System.currentTimeMillis(); - long toWait = seconds * 1000; - while (!server.isInitialised()) - { - try - { - Thread.sleep(100); - } - catch (InterruptedException e) - { - //ignore - } - if (server.isInitialised()) - { - break; - } - else if (System.currentTimeMillis() > (time + toWait)) - { - fail("server never started"); - } - } - } - - protected TransportConfiguration getInVMConnectorTransportConfiguration(final boolean live) { if (live) Modified: branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2011-07-05 16:09:43 UTC (rev 10923) +++ branches/HORNETQ-720_Replication/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2011-07-05 16:10:20 UTC (rev 10924) @@ -19,7 +19,13 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -127,25 +133,25 @@ } @Override - protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) + protected TransportConfiguration getConnectorTransportConfiguration(final boolean live) { - Map<String, Object> server1Params = new HashMap<String, Object>(); - if (!live) - { - server1Params.put(TransportConstants.SERVER_ID_PROP_NAME, 1); - } - return new TransportConfiguration(InVMAcceptorFactory.class.getName(), server1Params); + return createTransportConfiguration(InVMConnectorFactory.class.getName(), live); } @Override - protected TransportConfiguration getConnectorTransportConfiguration(final boolean live) + protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) { - Map<String, Object> server1Params = new HashMap<String, Object>(); + return createTransportConfiguration(InVMAcceptorFactory.class.getName(), live); + } + + private static TransportConfiguration createTransportConfiguration(String name, final boolean live) + { + Map<String, Object> serverParams = new HashMap<String, Object>(); if (!live) { - server1Params.put(TransportConstants.SERVER_ID_PROP_NAME, 1); + serverParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1); } - return new TransportConfiguration(InVMConnectorFactory.class.getName(), server1Params); + return new TransportConfiguration(name, serverParams); } }