Author: ritchiem
Date: Mon Aug 18 03:23:49 2008
New Revision: 686722
URL: http://svn.apache.org/viewvc?rev=686722&view=rev
Log:
QPID-1226 : Last few changes to correctly shutdown all ApplicationRegistries on
each test run
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
Mon Aug 18 03:23:49 2008
@@ -129,11 +129,17 @@
{
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);
+ }
+
}
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
Mon Aug 18 03:23:49 2008
@@ -294,12 +294,18 @@
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];
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
Mon Aug 18 03:23:49 2008
@@ -301,7 +301,7 @@
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 @@
_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++)
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
Mon Aug 18 03:23:49 2008
@@ -12,6 +12,7 @@
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 @@
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
Modified:
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
Mon Aug 18 03:23:49 2008
@@ -37,6 +37,7 @@
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 @@
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
Modified:
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java?rev=686722&r1=686721&r2=686722&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
Mon Aug 18 03:23:49 2008
@@ -55,6 +55,12 @@
_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
