diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-08-11 10:58:10 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-08-11 10:58:10 +0000 |
| commit | 2782e591b7d5b12051755753f8468110336263f1 (patch) | |
| tree | 9d5ee21f525a353a4a48bff784383504fb93d20d /qpid/java | |
| parent | f6c6648b2183fda371d930b372fdd7f0022a5783 (diff) | |
| download | qpid-python-2782e591b7d5b12051755753f8468110336263f1.tar.gz | |
QPID-1223 : Updated tests to correctly close the ApplicationRegistry that were created during the test run by non QpidTestCase classse
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@684708 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
3 files changed, 11 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java index eca642b556..fd11ddeae2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java @@ -30,7 +30,12 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase 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 diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java index 40d6f35c76..e14efe03a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java @@ -71,6 +71,7 @@ public class ReturnUnroutableMandatoryMessageTest extends TestCase implements Ex { super.tearDown(); TransportConnection.killAllVMBrokers(); + ApplicationRegistry.remove(1); } /** diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java index 08f78a3d28..d65a431a2a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java @@ -82,7 +82,11 @@ public class AckTest extends TestCase _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 |