Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the tests so that they're not dependent on port 61616 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084797 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2011-03-23 22:58:18 +00:00
parent 5cf486c975
commit 883eed0e38
4 changed files with 180 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerOutstandingCommitTest.java
View File

@ -56,14 +56,11 @@ public class FailoverConsumerOutstandingCommitTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerOutstandingCommitTest.class); private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerOutstandingCommitTest.class);
private static final String QUEUE_NAME = "FailoverWithOutstandingCommit"; private static final String QUEUE_NAME = "FailoverWithOutstandingCommit";
private static final String MESSAGE_TEXT = "Test message "; private static final String MESSAGE_TEXT = "Test message ";
private String url = "tcp://localhost:61616"; private static final String TRANSPORT_URI = "tcp://localhost:0";
private String url;
final int prefetch = 10; final int prefetch = 10;
BrokerService broker; BrokerService broker;
public void startCleanBroker() throws Exception {
startBroker(true);
}
@After @After
public void stopBroker() throws Exception { public void stopBroker() throws Exception {
if (broker != null) { if (broker != null) {
@ -77,8 +74,12 @@ public class FailoverConsumerOutstandingCommitTest {
} }
public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception { public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception {
return createBroker(deleteAllMessagesOnStartup, TRANSPORT_URI);
}
public BrokerService createBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
broker = new BrokerService(); broker = new BrokerService();
broker.addConnector(url); broker.addConnector(bindAddress);
broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup); broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup);
PolicyMap policyMap = new PolicyMap(); PolicyMap policyMap = new PolicyMap();
PolicyEntry defaultEntry = new PolicyEntry(); PolicyEntry defaultEntry = new PolicyEntry();
@ -89,6 +90,8 @@ public class FailoverConsumerOutstandingCommitTest {
policyMap.setDefaultEntry(defaultEntry); policyMap.setDefaultEntry(defaultEntry);
broker.setDestinationPolicy(policyMap); broker.setDestinationPolicy(policyMap);
url = broker.getTransportConnectors().get(0).getConnectUri().toString();
return broker; return broker;
} }
@ -174,7 +177,7 @@ public class FailoverConsumerOutstandingCommitTest {
// will be stopped by the plugin // will be stopped by the plugin
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
assertTrue("consumer added through failover", commitDoneLatch.await(20, TimeUnit.SECONDS)); assertTrue("consumer added through failover", commitDoneLatch.await(20, TimeUnit.SECONDS));
@ -280,7 +283,7 @@ public class FailoverConsumerOutstandingCommitTest {
// will be stopped by the plugin // will be stopped by the plugin
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
assertTrue("commit done through failover", commitDoneLatch.await(20, TimeUnit.SECONDS)); assertTrue("commit done through failover", commitDoneLatch.await(20, TimeUnit.SECONDS));
@ -323,7 +326,7 @@ public class FailoverConsumerOutstandingCommitTest {
// restart with outstanding delivered message // restart with outstanding delivered message
broker.stop(); broker.stop();
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
consumerSession.rollback(); consumerSession.rollback();

18
activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverConsumerUnconsumedTest.java
View File

@ -54,14 +54,11 @@ public class FailoverConsumerUnconsumedTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerUnconsumedTest.class); private static final Logger LOG = LoggerFactory.getLogger(FailoverConsumerUnconsumedTest.class);
private static final String QUEUE_NAME = "FailoverWithUnconsumed"; private static final String QUEUE_NAME = "FailoverWithUnconsumed";
private String url = "tcp://localhost:61616"; private static final String TRANSPORT_URI = "tcp://localhost:0";
private String url;
final int prefetch = 10; final int prefetch = 10;
BrokerService broker; BrokerService broker;
public void startCleanBroker() throws Exception {
startBroker(true);
}
@After @After
public void stopBroker() throws Exception { public void stopBroker() throws Exception {
if (broker != null) { if (broker != null) {
@ -75,9 +72,16 @@ public class FailoverConsumerUnconsumedTest {
} }
public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception { public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception {
return createBroker(deleteAllMessagesOnStartup, TRANSPORT_URI);
}
public BrokerService createBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
broker = new BrokerService(); broker = new BrokerService();
broker.addConnector(url); broker.addConnector(bindAddress);
broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup); broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup);
this.url = broker.getTransportConnectors().get(0).getConnectUri().toString();
return broker; return broker;
} }
@ -182,7 +186,7 @@ public class FailoverConsumerUnconsumedTest {
} }
})); }));
broker = createBroker(false); broker = createBroker(false, this.url);
broker.start(); broker.start();
assertTrue("consumer added through failover", commitDoneLatch.await(30, TimeUnit.SECONDS)); assertTrue("consumer added through failover", commitDoneLatch.await(30, TimeUnit.SECONDS));

18
activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverPrefetchZeroTest.java
View File

@ -48,14 +48,11 @@ public class FailoverPrefetchZeroTest {
private static final Logger LOG = LoggerFactory.getLogger(FailoverPrefetchZeroTest.class); private static final Logger LOG = LoggerFactory.getLogger(FailoverPrefetchZeroTest.class);
private static final String QUEUE_NAME = "FailoverPrefetchZero"; private static final String QUEUE_NAME = "FailoverPrefetchZero";
private String url = "tcp://localhost:61616"; private static final String TRANSPORT_URI = "tcp://localhost:0";
private String url;
final int prefetch = 0; final int prefetch = 0;
BrokerService broker; BrokerService broker;
public void startCleanBroker() throws Exception {
startBroker(true);
}
@After @After
public void stopBroker() throws Exception { public void stopBroker() throws Exception {
if (broker != null) { if (broker != null) {
@ -69,9 +66,16 @@ public class FailoverPrefetchZeroTest {
} }
public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception { public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception {
return createBroker(deleteAllMessagesOnStartup, TRANSPORT_URI);
}
public BrokerService createBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
broker = new BrokerService(); broker = new BrokerService();
broker.addConnector(url); broker.addConnector(bindAddress);
broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup); broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup);
url = broker.getTransportConnectors().get(0).getConnectUri().toString();
return broker; return broker;
} }
@ -135,7 +139,7 @@ public class FailoverPrefetchZeroTest {
// will be stopped by the plugin // will be stopped by the plugin
assertTrue("pull completed on broker", pullDone.await(30, TimeUnit.SECONDS)); assertTrue("pull completed on broker", pullDone.await(30, TimeUnit.SECONDS));
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
assertTrue("receive completed through failover", receiveDone.await(30, TimeUnit.SECONDS)); assertTrue("receive completed through failover", receiveDone.await(30, TimeUnit.SECONDS));

57
activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
View File

@ -60,17 +60,14 @@ public class FailoverTransactionTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FailoverTransactionTest.class); private static final Logger LOG = LoggerFactory.getLogger(FailoverTransactionTest.class);
private static final String QUEUE_NAME = "FailoverWithTx"; private static final String QUEUE_NAME = "FailoverWithTx";
private String url = "tcp://localhost:61616"; private static final String TRANSPORT_URI = "tcp://localhost:0";
private String url;
BrokerService broker; BrokerService broker;
public static Test suite() { public static Test suite() {
return suite(FailoverTransactionTest.class); return suite(FailoverTransactionTest.class);
} }
public void startCleanBroker() throws Exception {
startBroker(true);
}
public void setUp() throws Exception { public void setUp() throws Exception {
super.setMaxTestTime(20 * 60 * 1000); // some boxes can be real slow super.setMaxTestTime(20 * 60 * 1000); // some boxes can be real slow
super.setAutoFail(true); super.setAutoFail(true);
@ -87,17 +84,33 @@ public class FailoverTransactionTest extends TestSupport {
} }
} }
private void startCleanBroker() throws Exception {
startBroker(true);
}
public void startBroker(boolean deleteAllMessagesOnStartup) throws Exception { public void startBroker(boolean deleteAllMessagesOnStartup) throws Exception {
broker = createBroker(deleteAllMessagesOnStartup); broker = createBroker(deleteAllMessagesOnStartup);
broker.start(); broker.start();
} }
public void startBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
broker = createBroker(deleteAllMessagesOnStartup, bindAddress);
broker.start();
}
public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception { public BrokerService createBroker(boolean deleteAllMessagesOnStartup) throws Exception {
return createBroker(deleteAllMessagesOnStartup, TRANSPORT_URI);
}
public BrokerService createBroker(boolean deleteAllMessagesOnStartup, String bindAddress) throws Exception {
broker = new BrokerService(); broker = new BrokerService();
broker.setUseJmx(false); broker.setUseJmx(false);
broker.setAdvisorySupport(false); broker.setAdvisorySupport(false);
broker.addConnector(url); broker.addConnector(bindAddress);
broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup); broker.setDeleteAllMessagesOnStartup(deleteAllMessagesOnStartup);
url = broker.getTransportConnectors().get(0).getConnectUri().toString();
return broker; return broker;
} }
@ -114,7 +127,7 @@ public class FailoverTransactionTest extends TestSupport {
// restart to force failover and connection state recovery before the commit // restart to force failover and connection state recovery before the commit
broker.stop(); broker.stop();
startBroker(false); startBroker(false, url);
session.commit(); session.commit();
assertNotNull("we got the message", consumer.receive(20000)); assertNotNull("we got the message", consumer.receive(20000));
@ -182,7 +195,7 @@ public class FailoverTransactionTest extends TestSupport {
// will be stopped by the plugin // will be stopped by the plugin
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -202,7 +215,7 @@ public class FailoverTransactionTest extends TestSupport {
broker.waitUntilStopped(); broker.waitUntilStopped();
LOG.info("Checking for remaining/hung messages.."); LOG.info("Checking for remaining/hung messages..");
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -285,7 +298,7 @@ public class FailoverTransactionTest extends TestSupport {
// will be stopped by the plugin // will be stopped by the plugin
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
LOG.info("restarting...."); LOG.info("restarting....");
broker.start(); broker.start();
@ -309,7 +322,7 @@ public class FailoverTransactionTest extends TestSupport {
broker.waitUntilStopped(); broker.waitUntilStopped();
LOG.info("Checking for remaining/hung messages with second restart.."); LOG.info("Checking for remaining/hung messages with second restart..");
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -430,7 +443,7 @@ public class FailoverTransactionTest extends TestSupport {
broker.waitUntilStopped(); broker.waitUntilStopped();
LOG.info("Checking for remaining/hung messages with restart.."); LOG.info("Checking for remaining/hung messages with restart..");
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -462,7 +475,7 @@ public class FailoverTransactionTest extends TestSupport {
// restart to force failover and connection state recovery before the commit // restart to force failover and connection state recovery before the commit
broker.stop(); broker.stop();
startBroker(false); startBroker(false, url);
session.commit(); session.commit();
@ -493,7 +506,7 @@ public class FailoverTransactionTest extends TestSupport {
// restart to force failover and connection state recovery before the commit // restart to force failover and connection state recovery before the commit
broker.stop(); broker.stop();
startBroker(false); startBroker(false, url);
session.commit(); session.commit();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
@ -543,7 +556,7 @@ public class FailoverTransactionTest extends TestSupport {
// restart to force failover and connection state recovery before the commit // restart to force failover and connection state recovery before the commit
broker.stop(); broker.stop();
startBroker(false); startBroker(false, url);
session.commit(); session.commit();
for (int i = 0; i < count - 1; i++) { for (int i = 0; i < count - 1; i++) {
@ -671,7 +684,7 @@ public class FailoverTransactionTest extends TestSupport {
// will be stopped by the plugin // will be stopped by the plugin
broker.waitUntilStopped(); broker.waitUntilStopped();
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -708,7 +721,7 @@ public class FailoverTransactionTest extends TestSupport {
broker.waitUntilStopped(); broker.waitUntilStopped();
LOG.info("Checking for remaining/hung messages.."); LOG.info("Checking for remaining/hung messages..");
broker = createBroker(false); broker = createBroker(false, url);
setDefaultPersistenceAdapter(broker); setDefaultPersistenceAdapter(broker);
broker.start(); broker.start();
@ -744,7 +757,7 @@ public class FailoverTransactionTest extends TestSupport {
assertNotNull(msg); assertNotNull(msg);
broker.stop(); broker.stop();
broker = createBroker(false); broker = createBroker(false, url);
// use empty jdbc store so that default wait(0) for redeliveries will timeout after failover // use empty jdbc store so that default wait(0) for redeliveries will timeout after failover
setPersistenceAdapter(broker, PersistenceAdapterChoice.JDBC); setPersistenceAdapter(broker, PersistenceAdapterChoice.JDBC);
broker.start(); broker.start();
@ -756,7 +769,7 @@ public class FailoverTransactionTest extends TestSupport {
} }
broker.stop(); broker.stop();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
assertNotNull("should get rolledback message from original restarted broker", consumer.receive(20000)); assertNotNull("should get rolledback message from original restarted broker", consumer.receive(20000));
@ -784,7 +797,7 @@ public class FailoverTransactionTest extends TestSupport {
assertNotNull("got message just produced", msg); assertNotNull("got message just produced", msg);
broker.stop(); broker.stop();
broker = createBroker(false); broker = createBroker(false, url);
// use empty jdbc store so that wait for re-deliveries occur when failover resumes // use empty jdbc store so that wait for re-deliveries occur when failover resumes
setPersistenceAdapter(broker, PersistenceAdapterChoice.JDBC); setPersistenceAdapter(broker, PersistenceAdapterChoice.JDBC);
broker.start(); broker.start();
@ -803,7 +816,7 @@ public class FailoverTransactionTest extends TestSupport {
}); });
broker.stop(); broker.stop();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
assertTrue("commit was successful", commitDone.await(30, TimeUnit.SECONDS)); assertTrue("commit was successful", commitDone.await(30, TimeUnit.SECONDS));
@ -836,7 +849,7 @@ public class FailoverTransactionTest extends TestSupport {
MessageConsumer consumer2 = consumerSession.createConsumer(consumerSession.createQueue(QUEUE_NAME + "?consumer.prefetchSize=1")); MessageConsumer consumer2 = consumerSession.createConsumer(consumerSession.createQueue(QUEUE_NAME + "?consumer.prefetchSize=1"));
broker.stop(); broker.stop();
broker = createBroker(false); broker = createBroker(false, url);
broker.start(); broker.start();
final CountDownLatch commitDone = new CountDownLatch(1); final CountDownLatch commitDone = new CountDownLatch(1);