Updated Branches: refs/heads/trunk f74a65f4f -> 5a80cee96
Converted to JUnit4 because of CI hangs, see AMQ-5021 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5a80cee9 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5a80cee9 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5a80cee9 Branch: refs/heads/trunk Commit: 5a80cee9608fdf93fde7d5b132d6ddd8a9eba946 Parents: f74a65f Author: Kevin Earls <[email protected]> Authored: Tue Feb 4 11:10:52 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Tue Feb 4 11:10:52 2014 +0100 ---------------------------------------------------------------------- .../activemq/bugs/MemoryUsageBlockResumeTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5a80cee9/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java index 208ac8c..e8d5371 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/MemoryUsageBlockResumeTest.java @@ -36,9 +36,18 @@ import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.util.Wait; +import org.junit.After; +import org.junit.Before; +import org.junit.runners.BlockJUnit4ClassRunner; +import org.junit.runner.RunWith; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.Assert.*; + + +@RunWith(BlockJUnit4ClassRunner.class) public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.UncaughtExceptionHandler { public int deliveryMode = DeliveryMode.PERSISTENT; @@ -59,6 +68,7 @@ public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un private String connectionUri; private final Vector<Throwable> exceptions = new Vector<Throwable>(); + @Test(timeout = 60 * 1000) public void testBlockByOtherResumeNoException() throws Exception { ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(connectionUri); @@ -172,6 +182,7 @@ public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un } @Override + @Before public void setUp() throws Exception { Thread.setDefaultUncaughtExceptionHandler(this); @@ -198,6 +209,7 @@ public class MemoryUsageBlockResumeTest extends TestSupport implements Thread.Un } @Override + @After public void tearDown() throws Exception { if (broker != null) { broker.stop();
