Updated Branches: refs/heads/trunk c02755203 -> fa6aaf936
Bumped up test timeouts because of CI failures, also cleaned up imports Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/fa6aaf93 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/fa6aaf93 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/fa6aaf93 Branch: refs/heads/trunk Commit: fa6aaf9360df15a1fbb332ebaf5a2e09f0901d3d Parents: c027552 Author: Kevin Earls <[email protected]> Authored: Thu Jan 30 14:33:31 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Thu Jan 30 14:33:31 2014 +0100 ---------------------------------------------------------------------- .../org/apache/activemq/broker/QueueSubscriptionTest.java | 4 ++-- .../broker/policy/RoundRobinDispatchPolicyTest.java | 10 +++++----- .../activemq/broker/policy/SimpleDispatchPolicyTest.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/fa6aaf93/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java index 0177b7b..625ed92 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java @@ -84,7 +84,7 @@ public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport { assertTotalMessagesReceived(messageCount * producerCount); } - @Test(timeout = 60 * 1000) + @Test(timeout = 2 * 60 * 1000) public void testOneProducerTwoConsumersLargeMessagesOnePrefetch() throws Exception { consumerCount = 2; producerCount = 1; @@ -136,7 +136,7 @@ public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport { assertTotalMessagesReceived(messageCount * producerCount); } - @Test(timeout = 60 * 1000) + @Test(timeout = 2 * 60 * 1000) public void testManyProducersManyConsumers() throws Exception { consumerCount = 200; producerCount = 50; http://git-wip-us.apache.org/repos/asf/activemq/blob/fa6aaf93/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java index 77ca11f..221f603 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java @@ -16,11 +16,6 @@ */ package org.apache.activemq.broker.policy; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.MessageConsumer; -import javax.jms.Session; - import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.QueueSubscriptionTest; import org.apache.activemq.broker.region.policy.PolicyEntry; @@ -30,6 +25,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.MessageConsumer; +import javax.jms.Session; + @RunWith(BlockJUnit4ClassRunner.class) public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { http://git-wip-us.apache.org/repos/asf/activemq/blob/fa6aaf93/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SimpleDispatchPolicyTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SimpleDispatchPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SimpleDispatchPolicyTest.java index e181fe2..d6d6b08 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SimpleDispatchPolicyTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SimpleDispatchPolicyTest.java @@ -16,10 +16,6 @@ */ package org.apache.activemq.broker.policy; -import java.util.Iterator; - -import javax.jms.MessageConsumer; - import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.QueueSubscriptionTest; import org.apache.activemq.broker.region.policy.FixedCountSubscriptionRecoveryPolicy; @@ -31,7 +27,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; -import static org.junit.Assert.*; +import javax.jms.MessageConsumer; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; @RunWith(BlockJUnit4ClassRunner.class) public class SimpleDispatchPolicyTest extends QueueSubscriptionTest {
