Updated Branches: refs/heads/trunk fa6aaf936 -> e0e14e087
Removed some code I had commented out but forgot to delete Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e0e14e08 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e0e14e08 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e0e14e08 Branch: refs/heads/trunk Commit: e0e14e087bf42bc193df6cdbc90e98b932dfbc8d Parents: fa6aaf9 Author: Kevin Earls <[email protected]> Authored: Thu Jan 30 14:37:25 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Thu Jan 30 14:37:25 2014 +0100 ---------------------------------------------------------------------- .../broker/NioQueueSubscriptionTest.java | 46 +++++++------------- 1 file changed, 16 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/e0e14e08/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java index a71ebce..898256c 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java @@ -16,28 +16,10 @@ */ package org.apache.activemq.broker; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.jms.ConnectionFactory; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; - import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; - -import org.junit.After; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,7 +27,22 @@ import org.junit.runners.BlockJUnit4ClassRunner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import javax.jms.ConnectionFactory; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; @RunWith(BlockJUnit4ClassRunner.class) public class NioQueueSubscriptionTest extends QueueSubscriptionTest { @@ -59,17 +56,6 @@ public class NioQueueSubscriptionTest extends QueueSubscriptionTest { return new ActiveMQConnectionFactory("tcp://localhost:62621?trace=false"); } - /* - @Before - public void setUp() throws Exception { - super.setUp(); - } - - @After - public void tearDown() throws Exception { - super.tearDown(); - } - */ @Override protected BrokerService createBroker() throws Exception {
