From 44da73542614f9a853ff1e57efc8be9e2558761d Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 18 Aug 2008 10:23:49 +0000 Subject: QPID-1226 : Last few changes to correctly shutdown all ApplicationRegistries on each test run git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@686722 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/exchange/ExchangeMBeanTest.java | 8 +++++++- .../java/org/apache/qpid/server/queue/AMQQueueAlertTest.java | 8 +++++++- .../java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java | 7 ++++++- .../java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java | 10 ++++++++++ .../java/org/apache/qpid/server/store/MessageStoreTest.java | 11 +++++++++++ .../org/apache/qpid/management/ui/ManagementConsoleTest.java | 6 ++++++ 6 files changed, 47 insertions(+), 3 deletions(-) diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java index 2a2bc72950..8ce7b4c0e1 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java @@ -129,11 +129,17 @@ public class ExchangeMBeanTest extends TestCase { super.setUp(); - IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(); + IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1); _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test"); _queueRegistry = _virtualHost.getQueueRegistry(); _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost, null); _queueRegistry.registerQueue(_queue); } + + protected void tearDown() + { + ApplicationRegistry.remove(1); + } + } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java index dca6d9f613..5eafc18378 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java @@ -294,12 +294,18 @@ public class AMQQueueAlertTest extends TestCase protected void setUp() throws Exception { super.setUp(); - IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(); + IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1); _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test"); _protocolSession = new InternalTestProtocolSession(); } + protected void tearDown() + { + ApplicationRegistry.remove(1); + } + + private void sendMessages(long messageCount, final long size) throws AMQException { IncomingMessage[] messages = new IncomingMessage[(int) messageCount]; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java index 50bee71d59..eab8ad3e2e 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java @@ -301,7 +301,7 @@ public class AMQQueueMBeanTest extends TestCase protected void setUp() throws Exception { super.setUp(); - IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(); + IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance(1); _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test"); _messageStore = _virtualHost.getMessageStore(); @@ -317,6 +317,11 @@ public class AMQQueueMBeanTest extends TestCase _protocolSession = new InternalTestProtocolSession(); } + public void tearDown() + { + ApplicationRegistry.remove(1); + } + private void sendMessages(int messageCount, boolean persistent) throws AMQException { for (int i = 0; i < messageCount; i++) diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java index c69ca507ef..aa6ee6ff12 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java @@ -12,6 +12,7 @@ import org.apache.qpid.server.store.TestableMemoryMessageStore; import org.apache.qpid.server.txn.NonTransactionalContext; import org.apache.qpid.server.txn.TransactionalContext; import org.apache.qpid.server.virtualhost.VirtualHost; +import org.apache.qpid.server.registry.ApplicationRegistry; import junit.framework.TestCase; @@ -56,11 +57,20 @@ public class SimpleAMQQueueTest extends TestCase protected void setUp() throws Exception { super.setUp(); + //Create Application Registry for test + ApplicationRegistry.getInstance(1); + AMQShortString qname = new AMQShortString("qname"); AMQShortString owner = new AMQShortString("owner"); _queue = new SimpleAMQQueue(qname, false, owner, false, new VirtualHost("vhost", store)); } + @Override + protected void tearDown() + { + ApplicationRegistry.remove(1); + } + public void testGetFirstMessageId() throws Exception { // Create message diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java index 932486d954..0524494bfd 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java @@ -37,6 +37,7 @@ import org.apache.qpid.server.queue.SimpleAMQQueue; import org.apache.qpid.server.queue.ExchangeBinding; import org.apache.qpid.server.txn.NonTransactionalContext; import org.apache.qpid.server.protocol.InternalTestProtocolSession; +import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.ContentHeaderBody; @@ -130,6 +131,16 @@ public class MessageStoreTest extends TestCase AMQShortString directRouting = new AMQShortString("MST-direct"); AMQShortString topicRouting = new AMQShortString("MST-topic"); + protected void setUp() + { + ApplicationRegistry.getInstance(1); + } + + protected void tearDown() + { + ApplicationRegistry.remove(1); + } + protected void runTestWithStore(Configuration configuration) { //Ensure Environment Path is empty diff --git a/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java index fb616e2b59..11ab6af064 100644 --- a/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java +++ b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java @@ -55,6 +55,12 @@ public class ManagementConsoleTest extends TestCase _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test"); } + @Override + protected void tearDown() throws Exception + { + ApplicationRegistry.removeAll(); + } + /** * Test for AMQQueueMBean attribute and operation names, which are used in the management console * @throws Exception -- cgit v1.2.1