From 54a8ac49f24cdfe3900cf1c9b1c1d117b2779f52 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 2 Jun 2010 16:45:37 +0000 Subject: QPID-2632 : Update SCD to use IBBC git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@950650 13f79535-47bb-0310-9956-ffa450edef68 --- .../SlowConsumerDetectionConfigurationTest.java | 5 ++--- .../SlowConsumerDetectionPolicyConfigurationTest.java | 4 ++-- .../SlowConsumerDetectionQueueConfigurationTest.java | 4 ++-- .../policies/TopicDeletePolicyConfigurationTest.java | 4 ++-- .../plugin/policies/TopicDeletePolicyTest.java | 19 +++++-------------- 5 files changed, 13 insertions(+), 23 deletions(-) (limited to 'java') diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java index aee0bc6544..40dc382d30 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java @@ -20,12 +20,11 @@ */ package org.apache.qpid.server.virtualhost.plugin; -import junit.framework.TestCase; import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionConfiguration; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.server.util.InternalBrokerBaseCase; import java.util.concurrent.TimeUnit; @@ -33,7 +32,7 @@ import java.util.concurrent.TimeUnit; * Provide Unit Test coverage of the virtualhost SlowConsumer Configuration * This is what controls how often the plugin will execute */ -public class SlowConsumerDetectionConfigurationTest extends QpidTestCase +public class SlowConsumerDetectionConfigurationTest extends InternalBrokerBaseCase { /** diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java index 5e99ed2d71..67c177f099 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java @@ -24,12 +24,12 @@ import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.server.util.InternalBrokerBaseCase; /** * Test class to ensure that the policy configuration can be processed. */ -public class SlowConsumerDetectionPolicyConfigurationTest extends QpidTestCase +public class SlowConsumerDetectionPolicyConfigurationTest extends InternalBrokerBaseCase { /** diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java index dc37ab3a59..57e3233eeb 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java @@ -24,7 +24,7 @@ import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionQueueConfiguration; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.server.util.InternalBrokerBaseCase; /** * Unit test the QueueConfiguration processing. @@ -34,7 +34,7 @@ import org.apache.qpid.test.utils.QpidTestCase; * So all the Valid test much catch the ensuing ConfigurationException and * validate that the error is due to a lack of a valid Policy */ -public class SlowConsumerDetectionQueueConfigurationTest extends QpidTestCase +public class SlowConsumerDetectionQueueConfigurationTest extends InternalBrokerBaseCase { /** diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java index 56a1e9ceee..8b729a0f43 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfigurationTest.java @@ -23,12 +23,12 @@ package org.apache.qpid.server.virtualhost.plugin.policies; import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.server.util.InternalBrokerBaseCase; /** * Test to ensure TopicDelete Policy configuration can be loaded. */ -public class TopicDeletePolicyConfigurationTest extends QpidTestCase +public class TopicDeletePolicyConfigurationTest extends InternalBrokerBaseCase { /** * Test without any configuration being provided that the diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java index 7215db11fa..19954cb652 100644 --- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java +++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java @@ -32,10 +32,11 @@ import org.apache.qpid.server.protocol.InternalTestProtocolSession; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.MockAMQQueue; import org.apache.qpid.server.registry.ApplicationRegistry; +import org.apache.qpid.server.util.InternalBrokerBaseCase; import org.apache.qpid.server.virtualhost.VirtualHost; import org.apache.qpid.test.utils.QpidTestCase; -public class TopicDeletePolicyTest extends QpidTestCase +public class TopicDeletePolicyTest extends InternalBrokerBaseCase { TopicDeletePolicyConfiguration _config; @@ -43,8 +44,10 @@ public class TopicDeletePolicyTest extends QpidTestCase VirtualHost _defaultVhost; InternalTestProtocolSession _connection; - public void setUp() throws ConfigurationException, AMQException + public void setUp() throws Exception { + super.setUp(); + _defaultVhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getDefaultVirtualHost(); _connection = new InternalTestProtocolSession(_defaultVhost); @@ -56,18 +59,6 @@ public class TopicDeletePolicyTest extends QpidTestCase _config.setConfiguration("", config); } - public void tearDown() throws Exception - { - try - { - ApplicationRegistry.remove(); - } - finally - { - super.tearDown(); - } - } - private MockAMQQueue createOwnedQueue() { MockAMQQueue queue = new MockAMQQueue("testQueue"); -- cgit v1.2.1