Author: ritchiem
Date: Mon Aug 11 03:58:10 2008
New Revision: 684708
URL: http://svn.apache.org/viewvc?rev=684708&view=rev
Log:
QPID-1223 : Updated tests to correctly close the ApplicationRegistry that were
created during the test run by non QpidTestCase classse
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=684708&r1=684707&r2=684708&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Mon Aug 11 03:58:10 2008
@@ -30,7 +30,12 @@
protected void setUp() throws Exception
{
super.setUp();
- ApplicationRegistry.initialise(new NullApplicationRegistry());
+ ApplicationRegistry.initialise(new NullApplicationRegistry(), 1);
+ }
+
+ protected void tearDown()
+ {
+ ApplicationRegistry.remove(1);
}
public void testSimple() throws AMQException
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?rev=684708&r1=684707&r2=684708&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
Mon Aug 11 03:58:10 2008
@@ -71,6 +71,7 @@
{
super.tearDown();
TransportConnection.killAllVMBrokers();
+ ApplicationRegistry.remove(1);
}
/**
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java?rev=684708&r1=684707&r2=684708&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
Mon Aug 11 03:58:10 2008
@@ -82,7 +82,11 @@
_queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("myQ"),
false, new AMQShortString("guest"), true,
ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test"),
null);
+ }
+ protected void tearDown()
+ {
+ ApplicationRegistry.remove(1);
}
private void publishMessages(int count) throws AMQException
