diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2010-06-02 16:14:28 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2010-06-02 16:14:28 +0000 |
| commit | fc324fe97d76c61d0adcc9d2a20dbdc1d17a51cc (patch) | |
| tree | 3dc97a8c6a98a53609b57690dd33ab34efd99cba /qpid/java | |
| parent | 38453088e22210cb42898ad1a8e1ad0db67814f8 (diff) | |
| download | qpid-python-fc324fe97d76c61d0adcc9d2a20dbdc1d17a51cc.tar.gz | |
QPID-2639
Changed all existing test cases that extened QpidTestCase to QpidBrokerTestCase.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@950617 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
85 files changed, 181 insertions, 171 deletions
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java index 728b9d5872..42811e62ef 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java @@ -20,9 +20,9 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class TopicWithSelectorsTransientVolumeTest extends QpidTestCase +public class TopicWithSelectorsTransientVolumeTest extends QpidBrokerTestCase { private static final int NUM_MSG_PER_ITERATION = 50;//must be a multiple of 10 private static final int NUM_ITERATIONS = 1000; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java index f261858fcd..ca10126aa7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java @@ -29,12 +29,12 @@ import javax.jms.MessageProducer; import javax.jms.TextMessage; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.transport.TransportConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AMQQueueDeferredOrderingTest extends QpidTestCase +public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase { private static final int NUM_MESSAGES = 1000; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java index 6b638ced58..98517d0687 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java @@ -38,7 +38,7 @@ import javax.naming.spi.InitialContextFactory; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * When setting the message listener later the _synchronousQueue is just poll()'ed and the first message delivered * the remaining messages will be left on the queue and lost, subsequent messages on the session will arrive first. */ -public class DispatcherTest extends QpidTestCase +public class DispatcherTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(DispatcherTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java index 4c2fefb312..ca83b99120 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,7 @@ import java.util.UUID; * the message listener later the _synchronousQueue is just poll()'ed and the first message delivered the remaining * messages will be left on the queue and lost, subsequent messages on the session will arrive first. */ -public class MessageListenerMultiConsumerTest extends QpidTestCase +public class MessageListenerMultiConsumerTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(MessageListenerMultiConsumerTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java index ffec6c7a29..11d9ce2bbc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; * the message listener later the _synchronousQueue is just poll()'ed and the first message delivered the remaining * messages will be left on the queue and lost, subsequent messages on the session will arrive first. */ -public class MessageListenerTest extends QpidTestCase implements MessageListener +public class MessageListenerTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java index 61c1326ad5..29b4dd82a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.client.transport.TransportConnection; @@ -35,7 +35,7 @@ import java.util.LinkedList; * QPID-1394 : Test to ensure that the client can register their custom JCAProviders after the broker to ensure that * the Qpid custom authentication SASL plugins are used. */ -public class MultipleJCAProviderRegistrationTest extends QpidTestCase +public class MultipleJCAProviderRegistrationTest extends QpidBrokerTestCase { public void setUp() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java index 636fb714e0..303da29389 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; * the message listener later the _synchronousQueue is just poll()'ed and the first message delivered the remaining * messages will be left on the queue and lost, subsequent messages on the session will arrive first. */ -public class ResetMessageListenerTest extends QpidTestCase +public class ResetMessageListenerTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(ResetMessageListenerTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java index 1672c2a828..15900a17fe 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java @@ -24,7 +24,7 @@ import javax.jms.Connection; import javax.jms.Session; import javax.naming.Context; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; /** * Class to check that session creation on a connection has no accidental limit */ -public class SessionCreateTest extends QpidTestCase +public class SessionCreateTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java index e031475a76..004ce5ea8f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java @@ -42,10 +42,10 @@ import org.apache.qpid.client.message.AMQPEncodedMapMessage; import org.apache.qpid.client.message.AbstractJMSMessage; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ProtocolVersion; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class AMQPEncodedMapMessageTest extends QpidTestCase +public class AMQPEncodedMapMessageTest extends QpidBrokerTestCase { private Connection _connection; private Session _session; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java index 74326c02ec..f4cf948a8d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java @@ -7,10 +7,10 @@ import javax.jms.Session; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQTestConnection_0_10; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.Connection; -public class SSLTest extends QpidTestCase +public class SSLTest extends QpidBrokerTestCase { @Override diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java index 4a2d626a5b..d4c550bc08 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * This system test ensures that when loading our default system-test @@ -30,7 +30,7 @@ import org.apache.qpid.test.utils.QpidTestCase; * All configuration values should be set in the systest config file so that * the ability to load them can be validated. */ -public class ServerConfigurationFileTest extends QpidTestCase +public class ServerConfigurationFileTest extends QpidBrokerTestCase { ServerConfiguration _serverConfig; 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 20c833fac5..4b4fbd711b 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 @@ -43,11 +43,11 @@ import org.apache.qpid.client.AMQTopic; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.FieldTable; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.AMQBindingURL; import org.apache.qpid.url.BindingURL; -public class ReturnUnroutableMandatoryMessageTest extends QpidTestCase implements ExceptionListener +public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase implements ExceptionListener { private static final Logger _logger = Logger.getLogger(ReturnUnroutableMandatoryMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java index 4050637bb2..4c2758241e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java @@ -24,7 +24,7 @@ import org.apache.mina.common.WriteTimeoutException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.jms.ConnectionListener; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.FailoverBaseCase; import org.apache.qpid.AMQConnectionClosedException; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java index ce05c95473..edbf631890 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.logging; import org.apache.qpid.server.logging.subjects.AbstractTestLogSubject; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.util.LogMonitor; import java.io.IOException; @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -public class AbstractTestLogging extends QpidTestCase +public class AbstractTestLogging extends QpidBrokerTestCase { public static final long DEFAULT_LOG_WAIT = 2000; protected LogMonitor _monitor; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java index dc34915a91..a5aec3edce 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.server.persistent; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.jms.ConnectionListener; @@ -52,7 +52,7 @@ import java.io.File; * QPID-1813 highlights the lack of testing here as the broker will NPE as it * assumes that the client id of the publisher will always exist */ -public class NoLocalAfterRecoveryTest extends QpidTestCase implements ConnectionListener +public class NoLocalAfterRecoveryTest extends QpidBrokerTestCase implements ConnectionListener { protected final String MY_TOPIC_SUBSCRIPTION_NAME = this.getName(); protected static final int SEND_COUNT = 10; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java index 515d93a4e5..ae7be6f7f4 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java @@ -27,7 +27,7 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.AMQBindingURL; import javax.jms.Connection; @@ -42,7 +42,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class ConflationQueueTest extends QpidTestCase +public class ConflationQueueTest extends QpidBrokerTestCase { private static final int TIMEOUT = 1500; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java index 83f0f87bc5..4ac0d2c4d6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.server.queue; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import javax.jms.Connection; @@ -61,7 +61,7 @@ import java.util.concurrent.TimeUnit; * * Finally consume all the messages from the queue to clean up. */ -public class DeepQueueConsumeWithSelector extends QpidTestCase implements MessageListener +public class DeepQueueConsumeWithSelector extends QpidBrokerTestCase implements MessageListener { private static final int MESSAGE_COUNT = 10000; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java index 48c30d6409..e3fd042560 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java @@ -27,7 +27,7 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.management.common.mbeans.ManagedBroker; import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.test.utils.JMXTestUtils; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; import javax.jms.JMSException; @@ -57,7 +57,7 @@ import java.lang.reflect.UndeclaredThrowableException; * Tests should ensure that they clean up after themselves. * e,g. Durable queue creation test should perform a queue delete. */ -public class ModelTest extends QpidTestCase +public class ModelTest extends QpidBrokerTestCase { private static final String USER = "admin"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java index ca38807fb1..6203e8a194 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java @@ -29,7 +29,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQShortString; @@ -43,7 +43,7 @@ import java.util.Hashtable; import java.util.HashMap; import java.util.Map; -public class PriorityTest extends QpidTestCase +public class PriorityTest extends QpidBrokerTestCase { private static final int TIMEOUT = 1500; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java index 970b08f629..cbc2078571 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java @@ -38,12 +38,12 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.Condition; -public class TimeToLiveTest extends QpidTestCase +public class TimeToLiveTest extends QpidBrokerTestCase { private static final Logger _logger = Logger.getLogger(TimeToLiveTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java index 21c121ff2c..f845ff1214 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java @@ -41,7 +41,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.jms.ConnectionListener; import org.apache.qpid.protocol.AMQConstant; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.URLSyntaxException; /** @@ -50,7 +50,7 @@ import org.apache.qpid.url.URLSyntaxException; * This base class contains convenience methods to mange ACL files and implements a mechanism that allows each * test method to run its own setup code before the broker starts. * - * TODO move the pre broker-startup setup method invocation code to {@link QpidTestCase} + * TODO move the pre broker-startup setup method invocation code to {@link QpidBrokerTestCase} * * @see SimpleACLTest * @see ExternalACLTest @@ -59,7 +59,7 @@ import org.apache.qpid.url.URLSyntaxException; * @see ExternalAdminACLTest * @see ExhaustiveACLTest */ -public abstract class AbstractACLTestCase extends QpidTestCase implements ConnectionListener +public abstract class AbstractACLTestCase extends QpidBrokerTestCase implements ConnectionListener { /** Used to synchronise {@link #tearDown()} when exceptions are thrown */ protected CountDownLatch _exceptionReceived; @@ -82,7 +82,7 @@ public abstract class AbstractACLTestCase extends QpidTestCase implements Connec * as the test, but starting with {@code setUp} rather than {@code test}. * * @see #setUpACLFile(String) - * @see org.apache.qpid.test.utils.QpidTestCase#setUp() + * @see org.apache.qpid.test.utils.QpidBrokerTestCase#setUp() */ @Override public void setUp() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java index 874a0c37e2..fae8ee4a0a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java @@ -26,9 +26,9 @@ import javax.jms.Connection; import javax.jms.JMSException; import org.apache.qpid.client.AMQConnectionURL; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class FirewallConfigTest extends QpidTestCase +public class FirewallConfigTest extends QpidBrokerTestCase { private File _tmpConfig, _tmpVirtualhosts; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java index e1941d4629..b614392681 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java @@ -22,7 +22,7 @@ package org.apache.qpid.server.store; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; import javax.jms.Destination; @@ -35,7 +35,7 @@ import javax.jms.Session; import java.util.ArrayList; import java.util.List; -public class PersistentStoreTest extends QpidTestCase +public class PersistentStoreTest extends QpidBrokerTestCase { private static final int NUM_MESSAGES = 100; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java index 5ea203bda3..13a9dd73b8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java @@ -22,7 +22,7 @@ package org.apache.qpid.test.client; import org.apache.log4j.Logger; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; import javax.jms.MessageConsumer; @@ -32,7 +32,7 @@ import javax.jms.QueueBrowser; import javax.jms.Session; import java.util.Enumeration; -public class CancelTest extends QpidTestCase +public class CancelTest extends QpidBrokerTestCase { private static final Logger _logger = Logger.getLogger(CancelTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java index ec7dcee703..a94d975a32 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java @@ -1,6 +1,6 @@ package org.apache.qpid.test.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; * */ -public class DupsOkTest extends QpidTestCase +public class DupsOkTest extends QpidBrokerTestCase { private Queue _queue; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java index 95808e454f..e1f639afb6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java @@ -22,12 +22,12 @@ package org.apache.qpid.test.client; import org.apache.qpid.client.AMQSession_0_8; import org.apache.qpid.client.message.AbstractJMSMessage; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.log4j.Logger; import javax.jms.*; -public class FlowControlTest extends QpidTestCase +public class FlowControlTest extends QpidBrokerTestCase { private static final Logger _logger = Logger.getLogger(FlowControlTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java index ff766c907d..b944f2ddd2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java @@ -76,7 +76,7 @@ import junit.framework.AssertionFailedError; * the problem exists and will not be suitable as part of a system test. * */ -public class RollbackOrderTest extends QpidTestCase +public class RollbackOrderTest extends QpidBrokerTestCase { private Connection _connection; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java index 7edaa780df..b1cd064058 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java @@ -24,6 +24,7 @@ package org.apache.qpid.test.client.destination; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import javax.jms.Connection; import javax.jms.JMSException; import javax.jms.Message; @@ -37,11 +38,11 @@ import org.apache.qpid.client.AMQSession_0_10; import org.apache.qpid.client.messaging.address.Node.ExchangeNode; import org.apache.qpid.client.messaging.address.Node.QueueNode; import org.apache.qpid.messaging.Address; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AddressBasedDestinationTest extends QpidTestCase +public class AddressBasedDestinationTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(AddressBasedDestinationTest.class); private Connection _connection; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java index c307176f3f..2fbac83eb4 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java @@ -383,7 +383,7 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener } public void failoverComplete() - { + { failoverComplete.countDown(); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java index 984ae9446d..a7efe4922b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java @@ -28,7 +28,7 @@ import org.apache.qpid.client.CustomJMSXProperty; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.test.utils.JMXTestUtils; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; import javax.jms.Destination; @@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit; * When a message is received, its JMSDestination value must be equivalent to * the value assigned when it was sent. */ -public class JMSDestinationTest extends QpidTestCase +public class JMSDestinationTest extends QpidBrokerTestCase { private Connection _connection; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java index 39861bb2d5..1071861d47 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java @@ -22,7 +22,7 @@ package org.apache.qpid.test.client.message; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.framing.AMQShortString; import javax.jms.BytesMessage; @@ -44,7 +44,7 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.util.UUID; -public class MessageToStringTest extends QpidTestCase +public class MessageToStringTest extends QpidBrokerTestCase { private Connection _connection; private Session _session; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java index f0bbcc7003..147a03be0c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java @@ -22,7 +22,7 @@ package org.apache.qpid.test.client.message; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.framing.AMQShortString; import javax.jms.Connection; @@ -34,7 +34,7 @@ import javax.jms.Queue; import javax.jms.Session; import java.util.UUID; -public class ObjectMessageTest extends QpidTestCase +public class ObjectMessageTest extends QpidBrokerTestCase { private Connection _connection; private Session _session; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java index a09589b121..49a608190d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java @@ -39,11 +39,11 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.BasicMessageProducer; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SelectorTest extends QpidTestCase implements MessageListener +public class SelectorTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java index a123fb290c..85565a33b0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java @@ -33,7 +33,7 @@ import javax.jms.Session; import org.apache.commons.configuration.XMLConfiguration; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * This test must be run in conjunction with SyncWaiteTimeoutDelay or be run with POST_COMMIT_DELAY > 30s to ensure * that the default value is being replaced. */ -public class SyncWaitDelayTest extends QpidTestCase +public class SyncWaitDelayTest extends QpidBrokerTestCase { protected static final Logger _logger = LoggerFactory.getLogger(SyncWaitDelayTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java index 5a76ff251b..ddffc4cabf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java @@ -25,7 +25,7 @@ import org.apache.log4j.NDC; import org.apache.qpid.test.framework.BrokerLifecycleAware; import org.apache.qpid.test.framework.sequencers.CircuitFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.junit.extensions.SetupTaskAware; import org.apache.qpid.junit.extensions.SetupTaskHandler; @@ -47,7 +47,7 @@ import java.util.List; * <tr><td> Convert failed assertions to error messages. * </table> */ -public class FrameworkBaseCase extends QpidTestCase implements FrameworkTestContext, SetupTaskAware, +public class FrameworkBaseCase extends QpidBrokerTestCase implements FrameworkTestContext, SetupTaskAware, BrokerLifecycleAware { /** Used for debugging purposes. */ diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java index 6c4b7ba01b..6c83136511 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java @@ -23,7 +23,7 @@ package org.apache.qpid.test.unit.ack; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.jms.ConnectionListener; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.JMSException; import javax.jms.Message; @@ -49,7 +49,7 @@ import javax.jms.Session; * connection/session are still working. * */ -public class QuickAcking extends QpidTestCase implements ConnectionListener +public class QuickAcking extends QpidBrokerTestCase implements ConnectionListener { protected AMQConnection _connection; protected Queue _queue; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java index 666b914c09..a3dd7e4a99 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java @@ -316,7 +316,9 @@ public class RecoverTest extends FailoverBaseCase } /** - * Test strategy + * Goal : Check if ordering is preserved when doing recovery under reasonable circumstances. + * Refer QPID-2471 for more details. + * Test strategy : * Send 8 messages to a topic. * The consumer will call recover until it sees a message 5 times, * at which point it will ack that message. @@ -336,7 +338,8 @@ public class RecoverTest extends FailoverBaseCase int messageSeen = 0; int expectedMsg = 0; - + + // need to add a timer here as well. while(expectedMsg < 8) { Message message = cons.receive(); @@ -362,7 +365,8 @@ public class RecoverTest extends FailoverBaseCase } /** - * Test strategy + * Goal : Same as testOderingWithSyncConsumer + * Test strategy : * Same as testOderingWithSyncConsumer but using a * Message Listener instead of a sync receive(). */ diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java index 7db53ec50c..59ce64eb4f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java @@ -28,7 +28,7 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSBytesMessage; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.util.Waiter; import org.slf4j.Logger; @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class BytesMessageTest extends QpidTestCase implements MessageListener +public class BytesMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(BytesMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java index 979023d4b6..abf8da799c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java @@ -30,7 +30,7 @@ import org.apache.qpid.client.message.JMSBytesMessage; import org.apache.qpid.framing.AMQFrameDecodingException; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.FieldTableFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class FieldTableMessageTest extends QpidTestCase implements MessageListener +public class FieldTableMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(FieldTableMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java index 06f4a6464f..c9f6a22500 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java @@ -23,7 +23,7 @@ package org.apache.qpid.test.unit.basic; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Session; import javax.jms.QueueSession; @@ -32,7 +32,7 @@ import javax.jms.QueueSender; import javax.jms.TextMessage; import javax.jms.InvalidDestinationException; -public class InvalidDestinationTest extends QpidTestCase +public class InvalidDestinationTest extends QpidBrokerTestCase { private AMQConnection _connection; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index 9558f23b89..d97e22e024 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java @@ -24,7 +24,7 @@ package org.apache.qpid.test.unit.basic; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -public class LargeMessageTest extends QpidTestCase +public class LargeMessageTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java index 390850185c..9f13ddcfdb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java @@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSMapMessage; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class MapMessageTest extends QpidTestCase implements MessageListener +public class MapMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(MapMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index 4596878935..3a5f676ca6 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java @@ -25,7 +25,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ import javax.jms.MessageListener; import javax.jms.MessageProducer; import javax.jms.Session; -public class MultipleConnectionTest extends QpidTestCase +public class MultipleConnectionTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(MultipleConnectionTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java index d2965bd52a..c8e7368092 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java @@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSObjectMessage; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class ObjectMessageTest extends QpidTestCase implements MessageListener +public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java index 96a162dec3..3b8b4946da 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java @@ -28,7 +28,7 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.message.JMSTextMessage; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.BindingURL; import org.apache.qpid.url.AMQBindingURL; @@ -53,7 +53,7 @@ import java.net.URISyntaxException; import java.lang.reflect.*; -public class PropertyValueTest extends QpidTestCase implements MessageListener +public class PropertyValueTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(PropertyValueTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java index 66c5a5b07e..c257dacf76 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java @@ -30,12 +30,12 @@ import javax.jms.Topic; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * @author Apache Software Foundation */ -public class PubSubTwoConnectionTest extends QpidTestCase +public class PubSubTwoConnectionTest extends QpidBrokerTestCase { protected void setUp() throws Exception { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java index eec3db8c5f..bc44617620 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java @@ -27,9 +27,9 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class ReceiveTest extends QpidTestCase +public class ReceiveTest extends QpidBrokerTestCase { private AMQConnection _connection; private AMQDestination _destination; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java index 10320914fe..ee837fd41a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java @@ -25,7 +25,7 @@ import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; -public class SessionStartTest extends QpidTestCase implements MessageListener +public class SessionStartTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(SessionStartTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java index 29943161d4..a87de8ac0c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java @@ -27,7 +27,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSTextMessage; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -public class TextMessageTest extends QpidTestCase implements MessageListener +public class TextMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(TextMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java index 89316b6511..c6b8069300 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java @@ -19,7 +19,7 @@ * */ package org.apache.qpid.test.unit.basic.close; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.url.AMQBindingURL; @@ -31,7 +31,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -public class CloseTest extends QpidTestCase +public class CloseTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(CloseTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java index 9ee6103607..5e83b0569d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java @@ -47,11 +47,11 @@ import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AMQConnectionTest extends QpidTestCase +public class AMQConnectionTest extends QpidBrokerTestCase { private static AMQConnection _connection; private static AMQTopic _topic; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java index 7c0147b786..93cceb1048 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java @@ -28,12 +28,12 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * Tests for QueueReceiver and TopicSubscriber creation methods on AMQSession */ -public class AMQSessionTest extends QpidTestCase +public class AMQSessionTest extends QpidBrokerTestCase { private static AMQSession _session; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java index c9810e7304..33575b58aa 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; import javax.jms.JMSException; @@ -34,7 +34,7 @@ import javax.jms.Session; * qpid.declare_exchanges system properties functions as expected. * */ -public class DynamicQueueExchangeCreateTest extends QpidTestCase +public class DynamicQueueExchangeCreateTest extends QpidBrokerTestCase { public void testQueueDeclare() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java index 2710e7a08d..79e2ff8148 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java @@ -25,7 +25,7 @@ import junit.textui.TestRunner; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +56,7 @@ import java.util.List; * 3. Since client does not have an exception listener, currently all sessions are * closed. */ -public class ChannelCloseOkTest extends QpidTestCase +public class ChannelCloseOkTest extends QpidBrokerTestCase { private AMQConnection _connection; private Destination _destination1; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java index eb6adf9b39..f0794c9dab 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java @@ -21,7 +21,7 @@ package org.apache.qpid.test.unit.client.channelclose; import org.apache.qpid.AMQException; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.protocol.AMQProtocolHandler; @@ -44,7 +44,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -public class ChannelCloseTest extends QpidTestCase implements ExceptionListener, ConnectionListener +public class ChannelCloseTest extends QpidBrokerTestCase implements ExceptionListener, ConnectionListener { private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java index d4d19a34ea..56d03dc4a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java @@ -25,12 +25,12 @@ import javax.jms.Session; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * @author Apache Software Foundation */ -public class CloseWithBlockingReceiveTest extends QpidTestCase +public class CloseWithBlockingReceiveTest extends QpidBrokerTestCase { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java index f627d94419..dc2f59c384 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java @@ -24,7 +24,7 @@ import org.apache.qpid.AMQException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.url.URLSyntaxException; import javax.jms.ExceptionListener; @@ -33,7 +33,7 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import java.util.concurrent.CountDownLatch; -public class CloseAfterConnectionFailureTest extends QpidTestCase implements ExceptionListener +public class CloseAfterConnectionFailureTest extends QpidBrokerTestCase implements ExceptionListener { private int sessionCount = 0; AMQConnection connection; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java index 5d8ee785ec..512c3edca0 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client.connection; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.util.Logger; import java.util.HashMap; @@ -38,7 +38,7 @@ import javax.jms.TextMessage; * */ -public class ConnectionCloseTest extends QpidTestCase +public class ConnectionCloseTest extends QpidBrokerTestCase { private static final Logger log = Logger.get(ConnectionCloseTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java index 72691f3543..ac14f8e50e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java @@ -34,9 +34,9 @@ import javax.jms.TextMessage; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; -public class ConnectionStartTest extends QpidTestCase +public class ConnectionStartTest extends QpidBrokerTestCase { String _broker = "vm://:1"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java index a892b3baad..fb23d80843 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java @@ -24,7 +24,7 @@ import org.apache.qpid.AMQConnectionFailureException; import org.apache.qpid.AMQException; import org.apache.qpid.AMQUnresolvedAddressException; import org.apache.qpid.server.exchange.Exchange; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQAuthenticationException; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; @@ -42,7 +42,7 @@ import javax.jms.QueueSession; import javax.jms.TopicSession; import javax.naming.NamingException; -public class ConnectionTest extends QpidTestCase +public class ConnectionTest extends QpidBrokerTestCase { String _broker_NotRunning = "vm://:2"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java index e87902dad3..cec9d292cf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client.connection; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -33,7 +33,7 @@ import javax.jms.JMSException; * */ -public class ExceptionListenerTest extends QpidTestCase +public class ExceptionListenerTest extends QpidBrokerTestCase { public void testBrokerDeath() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java index d911bb33d7..b60fe76b76 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java @@ -24,7 +24,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,14 +48,14 @@ public class Client implements MessageListener private final AMQSession _session; private final int _expected; private int _count; - private static QpidTestCase _qct; + private static QpidBrokerTestCase _qct; Client(String broker, int expected) throws Exception { this(connect(broker), expected); } - public static void setQTC(QpidTestCase qtc) + public static void setQTC(QpidBrokerTestCase qtc) { _qct = qtc; } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java index a1001a6f5d..45945eb8fc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client.forwardall; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; * Runs the Service's and Client parts of the test in the same process * as the broker */ -public class CombinedTest extends QpidTestCase +public class CombinedTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(CombinedTest.class); private int run = 0; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java index ce50ceae19..160700bdda 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java @@ -28,7 +28,7 @@ import javax.jms.MessageListener; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * Declare a queue and bind it to amq.direct with a 'well known' routing key, @@ -39,10 +39,10 @@ public class Service implements MessageListener private final AMQConnection _connection; private final AMQSession _session; - private static QpidTestCase _qct; + private static QpidBrokerTestCase _qct; - public static void setQTC(QpidTestCase qtc) + public static void setQTC(QpidBrokerTestCase qtc) { _qct = qtc; } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index e67760a6c3..fd28b86762 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java @@ -24,7 +24,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -public class ObjectMessageTest extends QpidTestCase implements MessageListener +public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java index 7a27925a36..3c298e2d5a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java @@ -24,11 +24,11 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.protocol.AMQProtocolHandler; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.TestNetworkDriver; import org.apache.qpid.transport.NetworkDriver; -public class AMQProtocolSessionTest extends QpidTestCase +public class AMQProtocolSessionTest extends QpidBrokerTestCase { private static class AMQProtSession extends AMQProtocolSession { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java index 1d48955461..8c806fa2da 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java @@ -31,7 +31,7 @@ import javax.jms.TemporaryQueue; import javax.jms.TextMessage; import junit.framework.Assert; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.jms.ConnectionListener; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.LinkedList; -public class TemporaryQueueTest extends QpidTestCase implements ExceptionListener +public class TemporaryQueueTest extends QpidBrokerTestCase implements ExceptionListener { private List<Exception> _exceptions = new ArrayList<Exception>(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java index a61bcca049..039a172e4d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java @@ -22,7 +22,7 @@ package org.apache.qpid.test.unit.close; import junit.framework.Assert; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +43,7 @@ import javax.jms.Session; * <p><table id="crc"><caption>CRC Card</caption> <tr><th> Responsibilities <th> Collaborations <tr><td> Check that * closing a connection whilst handling a message, blocks till completion of the handler. </table> */ -public class CloseBeforeAckTest extends QpidTestCase +public class CloseBeforeAckTest extends QpidBrokerTestCase { private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java index 3fb6cd3526..6bc6c591ae 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java @@ -27,7 +27,7 @@ import org.apache.qpid.framing.AMQFrame; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ExchangeDeclareBody; import org.apache.qpid.framing.ExchangeDeclareOkBody; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Session; @@ -73,7 +73,7 @@ import javax.jms.Session; * sure to test that the BlockingWaiter is correctly awoken. * */ -public class JavaServerCloseRaceConditionTest extends QpidTestCase +public class JavaServerCloseRaceConditionTest extends QpidBrokerTestCase { private static final String EXCHANGE_NAME = "NewExchangeNametoFailLookup"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java index f1cac22f08..de092fc893 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java @@ -21,7 +21,7 @@ package org.apache.qpid.test.unit.close; import org.apache.qpid.AMQException; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.test.utils.QpidClientConnection; import org.apache.qpid.client.message.AbstractJMSMessage; import org.apache.qpid.url.URLSyntaxException; @@ -38,7 +38,7 @@ import javax.jms.Session; import java.util.concurrent.atomic.AtomicInteger; -public class MessageRequeueTest extends QpidTestCase +public class MessageRequeueTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(MessageRequeueTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java index da7642fb3c..8a6dfb86ee 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java @@ -26,12 +26,12 @@ import javax.jms.TopicSession; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * @author Apache Software Foundation */ -public class TopicPublisherCloseTest extends QpidTestCase +public class TopicPublisherCloseTest extends QpidBrokerTestCase { protected void setUp() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java index 8f76141bb1..3030572e13 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java @@ -23,13 +23,13 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * Crash Recovery tests for durable subscription * */ -public class DurableSubscriberTest extends QpidTestCase +public class DurableSubscriberTest extends QpidBrokerTestCase { private final String _topicName = "durableSubscriberTopic"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java index 6b69ccab6c..c582a049a2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java @@ -25,7 +25,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.NonQpidObjectMessage; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ import java.util.Enumeration; /** * @author Apache Software Foundation */ -public class JMSPropertiesTest extends QpidTestCase +public class JMSPropertiesTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(JMSPropertiesTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java index 2f613f6df4..98d59982e5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java @@ -30,7 +30,7 @@ import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.url.AMQBindingURL; import org.apache.qpid.url.BindingURL; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +48,7 @@ import javax.jms.StreamMessage; /** * @author Apache Software Foundation */ -public class StreamMessageTest extends QpidTestCase +public class StreamMessageTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(StreamMessageTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java index 8a9aee94dd..81089a4dfc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.message; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.transport.Connection; import org.apache.qpid.transport.Session; @@ -40,7 +40,7 @@ import java.io.*; * * those tests are related to qpid-1384 */ -public class UTF8Test extends QpidTestCase +public class UTF8Test extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(UTF8Test.class); @@ -90,9 +90,9 @@ public class UTF8Test extends QpidTestCase private void declareQueue(String exch, String routkey, String qname) throws Exception { Connection conn = new Connection(); - if (!_broker.equals(QpidTestCase.EXTERNAL) && !isBroker08()) + if (!_broker.equals(QpidBrokerTestCase.EXTERNAL) && !isBroker08()) { - conn.connect("localhost", QpidTestCase.DEFAULT_PORT, "test", "guest", "guest",false); + conn.connect("localhost", QpidBrokerTestCase.DEFAULT_PORT, "test", "guest", "guest",false); } else { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index 800ea4e509..d1132c14fb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Set; import org.apache.qpid.management.common.JMXConnnectionFactory; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; @@ -56,7 +56,7 @@ import javax.management.remote.JMXConnector; * out to make creating this test variation simpler. Want to make this variation available through LocalCircuit, * driven by the test model. */ -public class DurableSubscriptionTest extends QpidTestCase +public class DurableSubscriptionTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(DurableSubscriptionTest.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java index 6d115d1a2b..5874133ab1 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java @@ -28,12 +28,12 @@ import javax.jms.TopicSession; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** * @author Apache Software Foundation */ -public class TopicPublisherTest extends QpidTestCase +public class TopicPublisherTest extends QpidBrokerTestCase { protected void setUp() throws Exception { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java index a6b7e20a42..eee232e113 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java @@ -34,11 +34,11 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.client.AMQTopicSessionAdaptor; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; /** @author Apache Software Foundation */ -public class TopicSessionTest extends QpidTestCase +public class TopicSessionTest extends QpidBrokerTestCase { protected void setUp() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index b603455644..bc2cbe714f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.transacted; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.client.AMQConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; * * Assumptions; - Assumes empty Queue */ -public class CommitRollbackTest extends QpidTestCase +public class CommitRollbackTest extends QpidBrokerTestCase { protected AMQConnection conn; protected String queue = "direct://amq.direct//Qpid.Client.Transacted.CommitRollback.queue"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java index 1eec6dd17c..045deab052 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java @@ -26,7 +26,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.jms.Session; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.TextMessage; -public class TransactedTest extends QpidTestCase +public class TransactedTest extends QpidBrokerTestCase { private AMQQueue queue1; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java index 3906be2cc7..f39f640d04 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java @@ -18,7 +18,7 @@ package org.apache.qpid.test.unit.xa; import org.apache.qpid.dtx.XidImpl; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.transaction.xa.Xid; import javax.transaction.xa.XAResource; @@ -29,7 +29,7 @@ import java.util.Random; * * */ -public abstract class AbstractXATestCase extends QpidTestCase +public abstract class AbstractXATestCase extends QpidBrokerTestCase { protected static final String _sequenceNumberPropertyName = "seqNumber"; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java index e7eaefca98..d3b429e315 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java @@ -30,7 +30,7 @@ import org.apache.qpid.client.AMQConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class FailoverBaseCase extends QpidTestCase +public class FailoverBaseCase extends QpidBrokerTestCase { protected static final Logger _logger = LoggerFactory.getLogger(FailoverBaseCase.class); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java index 18e373b8d7..a9dafe7ae8 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java @@ -45,14 +45,14 @@ import org.apache.qpid.management.common.mbeans.UserManagement; */ public class JMXTestUtils { - QpidTestCase _test; + QpidBrokerTestCase _test; MBeanServerConnection _mbsc; JMXConnector _jmxc; private String USER; private String PASSWORD; - public JMXTestUtils(QpidTestCase test, String user, String password) + public JMXTestUtils(QpidBrokerTestCase test, String user, String password) { _test = test; USER = user; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 2dfcfdc379..41c24a453d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -187,6 +187,11 @@ public class QpidBrokerTestCase extends QpidTestCase super(name); } + public QpidBrokerTestCase() + { + super(); + } + public Logger getLogger() { return QpidBrokerTestCase._logger; diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java index 35cab0fd33..16f7bfd305 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java @@ -23,7 +23,7 @@ package org.apache.qpid.test.utils; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.JMSAMQException; -import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -public class QpidClientConnection extends QpidTestCase implements ExceptionListener +public class QpidClientConnection extends QpidBrokerTestCase implements ExceptionListener { private static final Logger _logger = LoggerFactory.getLogger(QpidClientConnection.class); |