You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/03/22 21:24:43 UTC
svn commit: r1459969 -
/activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
Author: tabish
Date: Fri Mar 22 20:24:43 2013
New Revision: 1459969
URL: http://svn.apache.org/r1459969
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-4400
Modified:
activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
Modified: activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java?rev=1459969&r1=1459968&r2=1459969&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java (original)
+++ activemq/trunk/activemq-spring/src/test/java/org/apache/bugs/LoadBalanceTest.java Fri Mar 22 20:24:43 2013
@@ -53,7 +53,7 @@ public class LoadBalanceTest {
private static final String TESTING_QUEUE = "testingqueue";
private static int networkBridgePrefetch = 1000;
- @Test
+ @Test(timeout=120000)
public void does_load_balance_between_consumers() throws Exception {
BrokerService brokerService1 = null;
BrokerService brokerService2 = null;
@@ -61,13 +61,13 @@ public class LoadBalanceTest {
final AtomicInteger broker1Count = new AtomicInteger(0);
final AtomicInteger broker2Count = new AtomicInteger(0);
final CountDownLatch startProducer = new CountDownLatch(1);
+ final CountDownLatch consumer1Started = new CountDownLatch(1);
+ final CountDownLatch consumer2Started = new CountDownLatch(1);
String broker1Uri;
String broker2Uri;
try {
-
-
brokerService1 = new BrokerService();
brokerService1.setBrokerName("one");
brokerService1.setUseJmx(false);
@@ -118,6 +118,7 @@ public class LoadBalanceTest {
});
container1.afterPropertiesSet();
container1.start();
+ consumer1Started.countDown();
pool.submit(new Callable<Object>() {
@Override
@@ -143,6 +144,7 @@ public class LoadBalanceTest {
});
container2.afterPropertiesSet();
container2.start();
+ consumer2Started.countDown();
assertTrue("wait for start signal", startProducer.await(20, TimeUnit.SECONDS));
@@ -185,9 +187,11 @@ public class LoadBalanceTest {
waitForBridgeFormation();
startProducer.countDown();
+ consumer1Started.await();
+ consumer2Started.await();
pool.shutdown();
- pool.awaitTermination(10, TimeUnit.SECONDS);
+ pool.awaitTermination(20, TimeUnit.SECONDS);
LOG.info("broker1Count " + broker1Count.get() + ", broker2Count " + broker2Count.get());
int count = 0;