From fa30a739c27ec4e2d1b8bf6cb7f6e34c0bcfc967 Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Fri, 29 Feb 2008 10:30:37 +0000 Subject: Rollback 632067 and 632072 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@632285 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/MessageListenerMultiConsumerTest.java | 4 +- .../apache/qpid/client/MessageListenerTest.java | 4 +- .../qpid/client/ResetMessageListenerTest.java | 10 +- .../org/apache/qpid/test/unit/ack/RecoverTest.java | 4 +- .../qpid/test/unit/basic/BytesMessageTest.java | 4 +- .../test/unit/basic/FieldTableMessageTest.java | 4 +- .../test/unit/basic/InvalidDestinationTest.java | 4 +- .../qpid/test/unit/basic/LargeMessageTest.java | 4 +- .../qpid/test/unit/basic/MapMessageTest.java | 4 +- .../test/unit/basic/MultipleConnectionTest.java | 4 +- .../qpid/test/unit/basic/ObjectMessageTest.java | 6 +- .../qpid/test/unit/basic/PropertyValueTest.java | 6 +- .../test/unit/basic/PubSubTwoConnectionTest.java | 7 +- .../apache/qpid/test/unit/basic/ReceiveTest.java | 8 +- .../apache/qpid/test/unit/basic/SelectorTest.java | 7 +- .../qpid/test/unit/basic/SessionStartTest.java | 6 +- .../qpid/test/unit/basic/TextMessageTest.java | 4 +- .../qpid/test/unit/basic/close/CloseTests.java | 8 +- .../qpid/test/unit/client/AMQConnectionTest.java | 4 +- .../qpid/test/unit/client/AMQSessionTest.java | 4 +- .../client/channelclose/ChannelCloseOkTest.java | 4 +- .../unit/client/channelclose/ChannelCloseTest.java | 6 +- .../channelclose/CloseWithBlockingReceiveTest.java | 8 +- .../client/connection/ConnectionCloseTest.java | 4 +- .../client/connection/ConnectionStartTest.java | 4 +- .../client/connection/ExceptionListenerTest.java | 4 +- .../qpid/test/unit/client/forwardall/Client.java | 6 +- .../test/unit/client/forwardall/CombinedTest.java | 5 +- .../qpid/test/unit/client/forwardall/Service.java | 6 +- .../unit/client/message/ObjectMessageTest.java | 4 +- .../client/temporaryqueue/TemporaryQueueTest.java | 5 +- .../qpid/test/unit/close/CloseBeforeAckTest.java | 6 +- .../qpid/test/unit/close/MessageRequeueTest.java | 6 +- .../test/unit/close/TopicPublisherCloseTest.java | 7 +- .../qpid/test/unit/ct/DurableSubscriberTests.java | 4 +- .../qpid/test/unit/message/JMSDestinationTest.java | 4 +- .../qpid/test/unit/message/JMSPropertiesTest.java | 7 +- .../qpid/test/unit/message/StreamMessageTest.java | 4 +- .../test/unit/topic/DurableSubscriptionTest.java | 10 +- .../qpid/test/unit/topic/TopicPublisherTest.java | 4 +- .../qpid/test/unit/topic/TopicSessionTest.java | 7 +- .../test/unit/transacted/CommitRollbackTest.java | 4 +- .../qpid/test/unit/transacted/TransactedTest.java | 4 +- .../qpid/test/unit/xa/AbstractXATestBase.java | 131 ---------- .../qpid/test/unit/xa/AbstractXATestCase.java | 131 ++++++++++ .../org/apache/qpid/test/unit/xa/QueueTest.java | 2 +- .../org/apache/qpid/test/unit/xa/TopicTest.java | 2 +- .../apache/qpid/testutil/QpidClientConnection.java | 5 +- .../org/apache/qpid/testutil/QpidTestBase.java | 288 --------------------- .../org/apache/qpid/testutil/QpidTestCase.java | 288 +++++++++++++++++++++ 50 files changed, 566 insertions(+), 510 deletions(-) delete mode 100644 java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestBase.java create mode 100644 java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java delete mode 100644 java/client/src/test/java/org/apache/qpid/testutil/QpidTestBase.java create mode 100644 java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java (limited to 'java/client/src/test') diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java index c93003b863..75e50ee09b 100644 --- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java @@ -21,7 +21,7 @@ package org.apache.qpid.client; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,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 MessageListenerMultiConsumerTest extends QpidTestBase +public class MessageListenerMultiConsumerTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(MessageListenerMultiConsumerTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java index 78f23c8ce0..2eb511f8cd 100644 --- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java @@ -21,7 +21,7 @@ package org.apache.qpid.client; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase implements MessageListener +public class MessageListenerTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java index 12f2ce005c..882915fb8f 100644 --- a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java @@ -20,14 +20,20 @@ */ package org.apache.qpid.client; -import org.apache.qpid.testutil.QpidTestBase; +import junit.framework.TestCase; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.jndi.PropertiesFileInitialContextFactory; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.jms.*; import javax.naming.Context; +import javax.naming.spi.InitialContextFactory; +import java.util.Hashtable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -40,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 ResetMessageListenerTest extends QpidTestBase +public class ResetMessageListenerTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(ResetMessageListenerTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java index 0030b09061..283db2a95b 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java @@ -23,7 +23,7 @@ import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.jms.Session; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ import javax.jms.TextMessage; import java.util.concurrent.atomic.AtomicInteger; -public class RecoverTest extends QpidTestBase +public class RecoverTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(RecoverTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java index 792634252e..cf09566f30 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java @@ -29,7 +29,7 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSBytesMessage; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class BytesMessageTest extends QpidTestBase implements MessageListener +public class BytesMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(BytesMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java index 28eea2d155..efc9195c53 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java @@ -31,7 +31,7 @@ import org.apache.qpid.framing.AMQFrameDecodingException; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.FieldTableFactory; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ import javax.jms.MessageProducer; import java.io.IOException; import java.util.ArrayList; -public class FieldTableMessageTest extends QpidTestBase implements MessageListener +public class FieldTableMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(FieldTableMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java index 265ad2c89e..a3c7b2ea48 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase +public class InvalidDestinationTest extends QpidTestCase { private AMQConnection _connection; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index 087f8861d3..6c23beffa7 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase +public class LargeMessageTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java index f117dd4d67..2c4df682f6 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase implements MessageListener +public class MapMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(MapMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index 63f4156020..4f3fc5501d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase +public class MultipleConnectionTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(MultipleConnectionTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java index e5cd058cdd..a385c196b2 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java @@ -20,13 +20,15 @@ package org.apache.qpid.test.unit.basic; import junit.framework.Assert; +import junit.framework.TestCase; 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.client.message.JMSObjectMessage; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +44,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class ObjectMessageTest extends QpidTestBase implements MessageListener +public class ObjectMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java index 55fd0969f2..737daeb350 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java @@ -21,14 +21,16 @@ package org.apache.qpid.test.unit.basic; import junit.framework.Assert; +import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.AMQMessage; import org.apache.qpid.client.message.JMSTextMessage; +import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +48,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class PropertyValueTest extends QpidTestBase implements MessageListener +public class PropertyValueTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(PropertyValueTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java index 80a800cedc..9e8f368985 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java @@ -27,15 +27,18 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.Topic; +import junit.framework.TestCase; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; /** * @author Apache Software Foundation */ -public class PubSubTwoConnectionTest extends QpidTestBase +public class PubSubTwoConnectionTest extends QpidTestCase { protected void setUp() throws Exception { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java index e48e9b81b0..5711d12b9e 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java @@ -23,13 +23,17 @@ package org.apache.qpid.test.unit.basic; import javax.jms.MessageConsumer; import javax.jms.Message; +import junit.framework.TestCase; + 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.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.testutil.QpidTestCase; -public class ReceiveTest extends QpidTestBase +public class ReceiveTest extends QpidTestCase { private AMQConnection _connection; private AMQDestination _destination; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java index 3dda2f1fe9..ed4f6041df 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java @@ -20,12 +20,15 @@ */ package org.apache.qpid.test.unit.basic; +import junit.framework.TestCase; + 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.client.BasicMessageProducer; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +38,7 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; -public class SelectorTest extends QpidTestBase implements MessageListener +public class SelectorTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java index bdede6f91f..7864feb069 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java @@ -20,13 +20,15 @@ */ package org.apache.qpid.test.unit.basic; +import junit.framework.TestCase; + 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.framing.AMQShortString; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +37,7 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageListener; -public class SessionStartTest extends QpidTestBase implements MessageListener +public class SessionStartTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(SessionStartTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java index 0624ff59f8..ba9963db41 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class TextMessageTest extends QpidTestBase implements MessageListener +public class TextMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(TextMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java index 3f288c2edc..83fcbd7e65 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java @@ -19,19 +19,23 @@ * */ package org.apache.qpid.test.unit.basic.close; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.AMQException; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.url.AMQBindingURL; +import org.apache.qpid.url.URLSyntaxException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.jms.JMSException; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -public class CloseTests extends QpidTestBase +public class CloseTests extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(CloseTests.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java index 33beb14490..158759bf1e 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java @@ -29,9 +29,9 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; -public class AMQConnectionTest extends QpidTestBase +public class AMQConnectionTest extends QpidTestCase { private static AMQConnection _connection; private static AMQTopic _topic; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java index 76785e06f3..6a4e01affd 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java @@ -29,12 +29,12 @@ import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.testutil.VMBrokerSetup; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; /** * Tests for QueueReceiver and TopicSubscriber creation methods on AMQSession */ -public class AMQSessionTest extends QpidTestBase +public class AMQSessionTest extends QpidTestCase { private static AMQSession _session; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java index afaf821b37..efbb380d4e 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase +public class ChannelCloseOkTest extends QpidTestCase { private AMQConnection _connection; private Destination _destination1; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java index 859115d536..08d6b0bcab 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java @@ -20,9 +20,11 @@ */ package org.apache.qpid.test.unit.client.channelclose; +import junit.framework.TestCase; + import org.apache.qpid.AMQException; import org.apache.qpid.AMQTimeoutException; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.protocol.AMQProtocolSession; @@ -52,7 +54,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -public class ChannelCloseTest extends QpidTestBase implements ExceptionListener, ConnectionListener +public class ChannelCloseTest extends QpidTestCase implements ExceptionListener, ConnectionListener { private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java index ea91b3e6e3..c3be691f2d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java @@ -20,17 +20,21 @@ */ package org.apache.qpid.test.unit.client.channelclose; +import javax.jms.Connection; import javax.jms.MessageConsumer; import javax.jms.Session; +import junit.framework.TestCase; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; /** * @author Apache Software Foundation */ -public class CloseWithBlockingReceiveTest extends QpidTestBase +public class CloseWithBlockingReceiveTest extends QpidTestCase { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java index 319c1ffd16..20443944d2 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpidity.transport.util.Logger; import javax.jms.Connection; @@ -35,7 +35,7 @@ import javax.jms.TextMessage; * */ -public class ConnectionCloseTest extends QpidTestBase +public class ConnectionCloseTest extends QpidTestCase { private static final Logger log = Logger.get(ConnectionCloseTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java index bae3eb627a..3cef57f90d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; -public class ConnectionStartTest extends QpidTestBase +public class ConnectionStartTest extends QpidTestCase { String _broker = "vm://:1"; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java index 017218bf19..ccf16a0b6e 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.util.concurrent.Condition; @@ -33,7 +33,7 @@ import javax.jms.JMSException; * */ -public class ExceptionListenerTest extends QpidTestBase +public class ExceptionListenerTest extends QpidTestCase { public void testBrokerDeath() throws Exception diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java index f6343174a3..f43ccaf0ff 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Client.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,14 +47,14 @@ public class Client implements MessageListener private final AMQSession _session; private final int _expected; private int _count; - private static QpidTestBase _qct; + private static QpidTestCase _qct; Client(String broker, int expected) throws Exception { this(connect(broker), expected); } - public static void setQTC(QpidTestBase qtc) + public static void setQTC(QpidTestCase qtc) { _qct = qtc; } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java index a22cad7d1d..29d9e5de2c 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java @@ -20,7 +20,8 @@ */ package org.apache.qpid.test.unit.client.forwardall; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.VMBrokerSetup; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,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 QpidTestBase +public class CombinedTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(CombinedTest.class); private int run = 0; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java index decb52495b..3dc9a3ccfb 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/Service.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; /** * 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 QpidTestBase _qct; + private static QpidTestCase _qct; - public static void setQTC(QpidTestBase qtc) + public static void setQTC(QpidTestCase qtc) { _qct = qtc; } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java index a38b818c1f..347c0c43da 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.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.testutil.VMBrokerSetup; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -public class ObjectMessageTest extends QpidTestBase implements MessageListener +public class ObjectMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java index 23754502e5..34197f2608 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java @@ -30,13 +30,14 @@ import javax.jms.TemporaryQueue; import javax.jms.TextMessage; import junit.framework.Assert; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.client.AMQQueue; +import org.apache.qpid.client.transport.TransportConnection; import java.util.List; import java.util.LinkedList; -public class TemporaryQueueTest extends QpidTestBase +public class TemporaryQueueTest extends QpidTestCase { protected void setUp() throws Exception { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java index 4f0bd76f10..e78c295ce5 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java @@ -22,7 +22,9 @@ package org.apache.qpid.test.unit.close; import junit.framework.Assert; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +45,7 @@ import javax.jms.Session; *

CRC Card
Responsibilities Collaborations
Check that * closing a connection whilst handling a message, blocks till completion of the handler.
*/ -public class CloseBeforeAckTest extends QpidTestBase +public class CloseBeforeAckTest extends QpidTestCase { private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java index ad14cc7c60..5ebde71d6c 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java @@ -21,9 +21,11 @@ package org.apache.qpid.test.unit.close; import org.apache.qpid.AMQException; +import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.message.AbstractJMSMessage; +import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.testutil.QpidClientConnection; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.url.URLSyntaxException; import org.slf4j.Logger; @@ -38,7 +40,7 @@ import javax.jms.Session; import java.util.concurrent.atomic.AtomicInteger; -public class MessageRequeueTest extends QpidTestBase +public class MessageRequeueTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(MessageRequeueTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java index 9997c7a3c8..2535692b5e 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java @@ -24,14 +24,17 @@ import javax.jms.Topic; import javax.jms.TopicPublisher; import javax.jms.TopicSession; +import junit.framework.TestCase; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; /** * @author Apache Software Foundation */ -public class TopicPublisherCloseTest extends QpidTestBase +public class TopicPublisherCloseTest extends QpidTestCase { protected void setUp() throws Exception diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTests.java index 030584dd65..af19db5128 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTests.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTests.java @@ -19,13 +19,13 @@ package org.apache.qpid.test.unit.ct; import javax.jms.*; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; /** * Crash Recovery tests for durable subscription * */ -public class DurableSubscriberTests extends QpidTestBase +public class DurableSubscriberTests extends QpidTestCase { private final String _topicName = "durableSubscriberTopic"; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java index 877c874daf..0b9d0bdc2d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java @@ -25,7 +25,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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ import javax.jms.TextMessage; /** * @author Apache Software Foundation */ -public class JMSDestinationTest extends QpidTestBase +public class JMSDestinationTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(JMSDestinationTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java index 18e35f99f8..c4b94a6f36 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java @@ -20,12 +20,15 @@ */ package org.apache.qpid.test.unit.message; +import junit.framework.TestCase; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.NonQpidObjectMessage; +import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +43,7 @@ import javax.jms.Session; /** * @author Apache Software Foundation */ -public class JMSPropertiesTest extends QpidTestBase +public class JMSPropertiesTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(JMSPropertiesTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java index b9f4df62ea..94addd55dd 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java @@ -29,7 +29,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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,7 @@ import javax.jms.StreamMessage; /** * @author Apache Software Foundation */ -public class StreamMessageTest extends QpidTestBase +public class StreamMessageTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(StreamMessageTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index 97a591436c..d765a3af18 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java @@ -20,14 +20,20 @@ */ package org.apache.qpid.test.unit.topic; -import org.apache.qpid.testutil.QpidTestBase; +import junit.framework.TestCase; + +import org.apache.qpid.AMQException; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.url.URLSyntaxException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; @@ -35,7 +41,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import javax.jms.TopicSubscriber; -public class DurableSubscriptionTest extends QpidTestBase +public class DurableSubscriptionTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(DurableSubscriptionTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java index 8eebfa2bea..4dfd4fdfea 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; /** * @author Apache Software Foundation */ -public class TopicPublisherTest extends QpidTestBase +public class TopicPublisherTest extends QpidTestCase { protected void setUp() throws Exception { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java index b081ad3f62..b905591f19 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java @@ -30,14 +30,17 @@ import javax.jms.TopicPublisher; import javax.jms.TopicSession; import javax.jms.TopicSubscriber; +import junit.framework.TestCase; + import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQTopic; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; /** @author Apache Software Foundation */ -public class TopicSessionTest extends QpidTestBase +public class TopicSessionTest extends QpidTestCase { protected void setUp() throws Exception diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 473ea8543c..cae8634f37 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.transacted; -import org.apache.qpid.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; import org.apache.qpid.client.AMQConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ import javax.jms.TextMessage; * * Assumptions; - Assumes empty Queue */ -public class CommitRollbackTest extends QpidTestBase +public class CommitRollbackTest extends QpidTestCase { protected AMQConnection conn; protected String queue = "direct://amq.direct//Qpid.Client.Transacted.CommitRollback.queue"; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java index f401d1faa4..1339cf9060 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java +++ b/java/client/src/test/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.testutil.QpidTestBase; +import org.apache.qpid.testutil.QpidTestCase; 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 QpidTestBase +public class TransactedTest extends QpidTestCase { private AMQQueue queue1; diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestBase.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestBase.java deleted file mode 100644 index 15c36644b1..0000000000 --- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestBase.java +++ /dev/null @@ -1,131 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.qpid.test.unit.xa; - -import org.apache.qpidity.dtx.XidImpl; -import org.apache.qpid.testutil.QpidTestBase; - -import javax.transaction.xa.Xid; -import javax.transaction.xa.XAResource; -import javax.jms.*; - -/** - * - * - */ -public abstract class AbstractXATestBase extends QpidTestBase -{ - protected static final String _sequenceNumberPropertyName = "seqNumber"; - - /** - * the xaResource associated with the standard session - */ - protected static XAResource _xaResource = null; - - /** - * producer registered with the standard session - */ - protected static MessageProducer _producer = null; - - /** - * consumer registered with the standard session - */ - protected static MessageConsumer _consumer = null; - - /** - * a standard message - */ - protected static TextMessage _message = null; - - /** - * xid counter - */ - private static int _xidCounter = 0; - - - protected void setUp() throws Exception - { - super.setUp(); - init(); - } - - public abstract void init(); - - - - /** - * construct a new Xid - * - * @return a new Xid - */ - protected Xid getNewXid() - { - byte[] branchQualifier; - byte[] globalTransactionID; - int format = _xidCounter; - String branchQualifierSt = "branchQualifier" + _xidCounter; - String globalTransactionIDSt = "globalTransactionID" + _xidCounter; - branchQualifier = branchQualifierSt.getBytes(); - globalTransactionID = globalTransactionIDSt.getBytes(); - _xidCounter++; - return new XidImpl(branchQualifier, format, globalTransactionID); - } - - public void init(XASession session, Destination destination) - { - // get the xaResource - try - { - _xaResource = session.getXAResource(); - } - catch (Exception e) - { - fail("cannot access the xa resource: " + e.getMessage()); - } - // create standard producer - try - { - _producer = session.createProducer(destination); - _producer.setDeliveryMode(DeliveryMode.PERSISTENT); - } - catch (JMSException e) - { - e.printStackTrace(); - fail("cannot create message producer: " + e.getMessage()); - } - // create standard consumer - try - { - _consumer = session.createConsumer(destination); - } - catch (JMSException e) - { - fail("cannot create message consumer: " + e.getMessage()); - } - // create a standard message - try - { - _message = session.createTextMessage(); - _message.setText("test XA"); - } - catch (JMSException e) - { - fail("cannot create standard message: " + e.getMessage()); - } - } -} diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java new file mode 100644 index 0000000000..7c03e16258 --- /dev/null +++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java @@ -0,0 +1,131 @@ +/* Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.qpid.test.unit.xa; + +import org.apache.qpidity.dtx.XidImpl; +import org.apache.qpid.testutil.QpidTestCase; + +import javax.transaction.xa.Xid; +import javax.transaction.xa.XAResource; +import javax.jms.*; + +/** + * + * + */ +public abstract class AbstractXATestCase extends QpidTestCase +{ + protected static final String _sequenceNumberPropertyName = "seqNumber"; + + /** + * the xaResource associated with the standard session + */ + protected static XAResource _xaResource = null; + + /** + * producer registered with the standard session + */ + protected static MessageProducer _producer = null; + + /** + * consumer registered with the standard session + */ + protected static MessageConsumer _consumer = null; + + /** + * a standard message + */ + protected static TextMessage _message = null; + + /** + * xid counter + */ + private static int _xidCounter = 0; + + + protected void setUp() throws Exception + { + super.setUp(); + init(); + } + + public abstract void init(); + + + + /** + * construct a new Xid + * + * @return a new Xid + */ + protected Xid getNewXid() + { + byte[] branchQualifier; + byte[] globalTransactionID; + int format = _xidCounter; + String branchQualifierSt = "branchQualifier" + _xidCounter; + String globalTransactionIDSt = "globalTransactionID" + _xidCounter; + branchQualifier = branchQualifierSt.getBytes(); + globalTransactionID = globalTransactionIDSt.getBytes(); + _xidCounter++; + return new XidImpl(branchQualifier, format, globalTransactionID); + } + + public void init(XASession session, Destination destination) + { + // get the xaResource + try + { + _xaResource = session.getXAResource(); + } + catch (Exception e) + { + fail("cannot access the xa resource: " + e.getMessage()); + } + // create standard producer + try + { + _producer = session.createProducer(destination); + _producer.setDeliveryMode(DeliveryMode.PERSISTENT); + } + catch (JMSException e) + { + e.printStackTrace(); + fail("cannot create message producer: " + e.getMessage()); + } + // create standard consumer + try + { + _consumer = session.createConsumer(destination); + } + catch (JMSException e) + { + fail("cannot create message consumer: " + e.getMessage()); + } + // create a standard message + try + { + _message = session.createTextMessage(); + _message.setText("test XA"); + } + catch (JMSException e) + { + fail("cannot create standard message: " + e.getMessage()); + } + } +} diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java index 46ea14f6c2..e786981183 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java @@ -26,7 +26,7 @@ import junit.framework.TestSuite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class QueueTest extends AbstractXATestBase +public class QueueTest extends AbstractXATestCase { /* this clas logger */ private static final Logger _logger = LoggerFactory.getLogger(QueueTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java index 337bf8497d..cac0350dec 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * */ -public class TopicTest extends AbstractXATestBase +public class TopicTest extends AbstractXATestCase { /* this clas logger */ private static final Logger _logger = LoggerFactory.getLogger(TopicTest.class); diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java index 574d8bda16..e99a51e1c7 100644 --- a/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java +++ b/java/client/src/test/java/org/apache/qpid/testutil/QpidClientConnection.java @@ -22,7 +22,10 @@ package org.apache.qpid.testutil; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQConnectionFactory; +import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.JMSAMQException; +import org.apache.qpid.url.URLSyntaxException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +40,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -public class QpidClientConnection extends QpidTestBase implements ExceptionListener +public class QpidClientConnection extends QpidTestCase implements ExceptionListener { private static final Logger _logger = LoggerFactory.getLogger(QpidClientConnection.class); diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestBase.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestBase.java deleted file mode 100644 index c90e71a16c..0000000000 --- a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestBase.java +++ /dev/null @@ -1,288 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.qpid.testutil; - -import junit.framework.TestCase; - -import javax.jms.Connection; -import javax.naming.InitialContext; -import java.io.InputStream; -import java.io.IOException; - -import org.apache.qpid.client.transport.TransportConnection; -import org.apache.qpid.client.AMQConnection; -import org.apache.qpid.client.AMQConnectionFactory; - - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * - * - */ -public class QpidTestBase extends TestCase -{ - - private static final Logger _logger = LoggerFactory.getLogger(QpidTestBase.class); - - // system properties - private static final String BROKER = "broker"; - private static final String BROKER_CLEAN = "broker.clean"; - private static final String BROKER_VERSION = "broker.version"; - - // values - private static final String VM = "vm"; - private static final String EXTERNAL = "external"; - private static final String VERSION_08 = "0-8"; - private static final String VERSION_010 = "0-10"; - - private String _broker = System.getProperty(BROKER, VM); - private String _brokerClean = System.getProperty(BROKER_CLEAN, null); - private String _brokerVersion = System.getProperty(BROKER_VERSION, VERSION_08); - - private Process _brokerProcess; - - private InitialContext _initialContext; - private AMQConnectionFactory _connectionFactory; - - public void runBare() throws Throwable - { - String name = getClass().getSimpleName() + "." + getName(); - _logger.info("========== start " + name + " =========="); - startBroker(); - try - { - super.runBare(); - } - finally - { - try - { - stopBroker(); - } - catch (Exception e) - { - _logger.error("exception stopping broker", e); - } - _logger.info("========== stop " + name + " =========="); - } - } - - private static final class Piper extends Thread - { - - private InputStream in; - - public Piper(InputStream in) - { - this.in = in; - } - - public void run() - { - try - { - byte[] buf = new byte[4*1024]; - int n; - while ((n = in.read(buf)) != -1) - { - System.out.write(buf, 0, n); - } - } - catch (IOException e) - { - // this seems to happen regularly even when - // exits are normal - } - } - } - - public void startBroker() throws Exception - { - if (_broker.equals(VM)) - { - // create an in_VM broker - TransportConnection.createVMBroker(1); - } - else if (!_broker.equals(EXTERNAL)) - { - _logger.info("starting broker: " + _broker); - ProcessBuilder pb = new ProcessBuilder(_broker.split("\\s+")); - pb.redirectErrorStream(true); - _brokerProcess = pb.start(); - - new Piper(_brokerProcess.getInputStream()).start(); - - Thread.sleep(1000); - - try - { - int exit = _brokerProcess.exitValue(); - _logger.info("broker aborted: " + exit); - cleanBroker(); - throw new RuntimeException("broker aborted: " + exit); - } - catch (IllegalThreadStateException e) - { - // this is expect if the broker started succesfully - } - } - } - - public void cleanBroker() - { - if (_brokerClean != null) - { - _logger.info("clean: " + _brokerClean); - - try - { - ProcessBuilder pb = new ProcessBuilder(_brokerClean.split("\\s+")); - pb.redirectErrorStream(true); - Process clean = pb.start(); - new Piper(clean.getInputStream()).start(); - - clean.waitFor(); - - _logger.info("clean exited: " + clean.exitValue()); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - catch (InterruptedException e) - { - throw new RuntimeException(e); - } - } - } - - public void stopBroker() throws Exception - { - _logger.info("stopping broker: " + _broker); - if (_brokerProcess != null) - { - _brokerProcess.destroy(); - _brokerProcess.waitFor(); - _logger.info("broker exited: " + _brokerProcess.exitValue()); - _brokerProcess = null; - } - else if (_broker.equals(VM)) - { - TransportConnection.killAllVMBrokers(); - } - } - - /** - * Check whether the broker is an 0.8 - * @return true if the broker is an 0_8 version, false otherwise. - */ - public boolean isBroker08() - { - return _brokerVersion.equals(VERSION_08); - } - - public boolean isBroker010() - { - return _brokerVersion.equals(VERSION_010); - } - - public void shutdownServer() throws Exception - { - stopBroker(); - startBroker(); - } - /** - * we assume that the environment is correctly set - * i.e. -Djava.naming.provider.url="..//example010.properties" - * TODO should be a way of setting that through maven - * - * @return an initial context - * @throws Exception if there is an error getting the context - */ - public InitialContext getInitialContext() throws Exception - { - _logger.info("get InitialContext"); - if (_initialContext == null) - { - _initialContext = new InitialContext(); - } - return _initialContext; - } - - /** - * Get a connection factory for the currently used broker - * - * @return A conection factory - * @throws Exception if there is an error getting the tactory - */ - public AMQConnectionFactory getConnectionFactory() throws Exception - { - _logger.info("get ConnectionFactory"); - if (_connectionFactory == null) - { - _connectionFactory = (AMQConnectionFactory) getInitialContext().lookup("local"); - } - return _connectionFactory; - } - - public Connection getConnection() throws Exception - { - return getConnection("guest", "guest"); - } - - /** - * Get a connection (remote or in-VM) - * - * @param username The user name - * @param password The user password - * @return a newly created connection - * @throws Exception if there is an error getting the connection - */ - public Connection getConnection(String username, String password) throws Exception - { - _logger.info("get Connection"); - Connection con; - if (_broker.equals(VM)) - { - con = new AMQConnection("vm://:1", username, password, "Test", "test"); - } - else - { - con = getConnectionFactory().createConnection(username, password); - } - return con; - } - - public Connection getConnection(String username, String password, String id) throws Exception - { - _logger.info("get Connection"); - Connection con; - if (_broker.equals(VM)) - { - con = new AMQConnection("vm://:1", username, password, id, "test"); - } - else - { - con = getConnectionFactory().createConnection(username, password); - } - return con; - } - -} diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java new file mode 100644 index 0000000000..60b1b70d67 --- /dev/null +++ b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java @@ -0,0 +1,288 @@ +/* Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.qpid.testutil; + +import junit.framework.TestCase; + +import javax.jms.Connection; +import javax.naming.InitialContext; +import java.io.InputStream; +import java.io.IOException; + +import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQConnectionFactory; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * + */ +public class QpidTestCase extends TestCase +{ + + private static final Logger _logger = LoggerFactory.getLogger(QpidTestCase.class); + + // system properties + private static final String BROKER = "broker"; + private static final String BROKER_CLEAN = "broker.clean"; + private static final String BROKER_VERSION = "broker.version"; + + // values + private static final String VM = "vm"; + private static final String EXTERNAL = "external"; + private static final String VERSION_08 = "0-8"; + private static final String VERSION_010 = "0-10"; + + private String _broker = System.getProperty(BROKER, VM); + private String _brokerClean = System.getProperty(BROKER_CLEAN, null); + private String _brokerVersion = System.getProperty(BROKER_VERSION, VERSION_08); + + private Process _brokerProcess; + + private InitialContext _initialContext; + private AMQConnectionFactory _connectionFactory; + + public void runBare() throws Throwable + { + String name = getClass().getSimpleName() + "." + getName(); + _logger.info("========== start " + name + " =========="); + startBroker(); + try + { + super.runBare(); + } + finally + { + try + { + stopBroker(); + } + catch (Exception e) + { + _logger.error("exception stopping broker", e); + } + _logger.info("========== stop " + name + " =========="); + } + } + + private static final class Piper extends Thread + { + + private InputStream in; + + public Piper(InputStream in) + { + this.in = in; + } + + public void run() + { + try + { + byte[] buf = new byte[4*1024]; + int n; + while ((n = in.read(buf)) != -1) + { + System.out.write(buf, 0, n); + } + } + catch (IOException e) + { + // this seems to happen regularly even when + // exits are normal + } + } + } + + public void startBroker() throws Exception + { + if (_broker.equals(VM)) + { + // create an in_VM broker + TransportConnection.createVMBroker(1); + } + else if (!_broker.equals(EXTERNAL)) + { + _logger.info("starting broker: " + _broker); + ProcessBuilder pb = new ProcessBuilder(_broker.split("\\s+")); + pb.redirectErrorStream(true); + _brokerProcess = pb.start(); + + new Piper(_brokerProcess.getInputStream()).start(); + + Thread.sleep(1000); + + try + { + int exit = _brokerProcess.exitValue(); + _logger.info("broker aborted: " + exit); + cleanBroker(); + throw new RuntimeException("broker aborted: " + exit); + } + catch (IllegalThreadStateException e) + { + // this is expect if the broker started succesfully + } + } + } + + public void cleanBroker() + { + if (_brokerClean != null) + { + _logger.info("clean: " + _brokerClean); + + try + { + ProcessBuilder pb = new ProcessBuilder(_brokerClean.split("\\s+")); + pb.redirectErrorStream(true); + Process clean = pb.start(); + new Piper(clean.getInputStream()).start(); + + clean.waitFor(); + + _logger.info("clean exited: " + clean.exitValue()); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + catch (InterruptedException e) + { + throw new RuntimeException(e); + } + } + } + + public void stopBroker() throws Exception + { + _logger.info("stopping broker: " + _broker); + if (_brokerProcess != null) + { + _brokerProcess.destroy(); + _brokerProcess.waitFor(); + _logger.info("broker exited: " + _brokerProcess.exitValue()); + _brokerProcess = null; + } + else if (_broker.equals(VM)) + { + TransportConnection.killAllVMBrokers(); + } + } + + /** + * Check whether the broker is an 0.8 + * @return true if the broker is an 0_8 version, false otherwise. + */ + public boolean isBroker08() + { + return _brokerVersion.equals(VERSION_08); + } + + public boolean isBroker010() + { + return _brokerVersion.equals(VERSION_010); + } + + public void shutdownServer() throws Exception + { + stopBroker(); + startBroker(); + } + /** + * we assume that the environment is correctly set + * i.e. -Djava.naming.provider.url="..//example010.properties" + * TODO should be a way of setting that through maven + * + * @return an initial context + * @throws Exception if there is an error getting the context + */ + public InitialContext getInitialContext() throws Exception + { + _logger.info("get InitialContext"); + if (_initialContext == null) + { + _initialContext = new InitialContext(); + } + return _initialContext; + } + + /** + * Get a connection factory for the currently used broker + * + * @return A conection factory + * @throws Exception if there is an error getting the tactory + */ + public AMQConnectionFactory getConnectionFactory() throws Exception + { + _logger.info("get ConnectionFactory"); + if (_connectionFactory == null) + { + _connectionFactory = (AMQConnectionFactory) getInitialContext().lookup("local"); + } + return _connectionFactory; + } + + public Connection getConnection() throws Exception + { + return getConnection("guest", "guest"); + } + + /** + * Get a connection (remote or in-VM) + * + * @param username The user name + * @param password The user password + * @return a newly created connection + * @throws Exception if there is an error getting the connection + */ + public Connection getConnection(String username, String password) throws Exception + { + _logger.info("get Connection"); + Connection con; + if (_broker.equals(VM)) + { + con = new AMQConnection("vm://:1", username, password, "Test", "test"); + } + else + { + con = getConnectionFactory().createConnection(username, password); + } + return con; + } + + public Connection getConnection(String username, String password, String id) throws Exception + { + _logger.info("get Connection"); + Connection con; + if (_broker.equals(VM)) + { + con = new AMQConnection("vm://:1", username, password, id, "test"); + } + else + { + con = getConnectionFactory().createConnection(username, password); + } + return con; + } + +} -- cgit v1.2.1