From 9d2e869d91d67666183185150e126949922469d4 Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Tue, 2 Oct 2007 16:13:07 +0000 Subject: Changed to use QpidTestCase git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@581290 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/test/unit/ack/RecoverTest.java | 22 +++++++++------------- .../qpid/test/unit/basic/BytesMessageTest.java | 6 +++--- .../test/unit/basic/FieldTableMessageTest.java | 7 +++---- .../qpid/test/unit/basic/close/CloseTests.java | 14 ++++---------- .../qpid/test/unit/client/AMQConnectionTest.java | 18 +++--------------- .../qpid/test/unit/client/AMQSessionTest.java | 22 ++++++++++++++-------- .../client/channelclose/ChannelCloseOkTest.java | 7 +++---- 7 files changed, 39 insertions(+), 57 deletions(-) (limited to 'java/client/src/test') 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 b6f46b4acc..caaaff4f68 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 @@ -19,13 +19,11 @@ */ package org.apache.qpid.test.unit.ack; -import junit.framework.TestCase; - import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.jms.Session; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +38,7 @@ import javax.jms.TextMessage; import java.util.concurrent.atomic.AtomicInteger; -public class RecoverTest extends TestCase +public class RecoverTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(RecoverTest.class); @@ -50,7 +48,6 @@ public class RecoverTest extends TestCase protected void setUp() throws Exception { super.setUp(); - TransportConnection.createVMBroker(1); _error = null; count = new AtomicInteger(); } @@ -58,13 +55,12 @@ public class RecoverTest extends TestCase protected void tearDown() throws Exception { super.tearDown(); - TransportConnection.killAllVMBrokers(); count = null; } public void testRecoverResendsMsgs() throws Exception { - AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); + AMQConnection con = (AMQConnection) getConnection("guest", "guest"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue queue = @@ -75,7 +71,7 @@ public class RecoverTest extends TestCase // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); // This is the default now - AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); + AMQConnection con2 = (AMQConnection) getConnection("guest", "guest"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageProducer producer = producerSession.createProducer(queue); @@ -123,7 +119,7 @@ public class RecoverTest extends TestCase public void testRecoverResendsMsgsAckOnEarlier() throws Exception { - AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); + AMQConnection con = (AMQConnection) getConnection("guest", "guest"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue queue = @@ -134,7 +130,7 @@ public class RecoverTest extends TestCase // ((AMQSession) consumerSession).declareExchangeSynch(ExchangeDefaults.DIRECT_EXCHANGE_NAME, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); // This is the default now - AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); + AMQConnection con2 = (AMQConnection) getConnection("guest", "guest"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageProducer producer = producerSession.createProducer(queue); @@ -188,7 +184,7 @@ public class RecoverTest extends TestCase public void testAcknowledgePerConsumer() throws Exception { - AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); + AMQConnection con = (AMQConnection) getConnection("guest", "guest"); Session consumerSession = con.createSession(false, Session.CLIENT_ACKNOWLEDGE); Queue queue = @@ -200,7 +196,7 @@ public class RecoverTest extends TestCase MessageConsumer consumer = consumerSession.createConsumer(queue); MessageConsumer consumer2 = consumerSession.createConsumer(queue2); - AMQConnection con2 = new AMQConnection("vm://:1", "guest", "guest", "producer1", "test"); + AMQConnection con2 = (AMQConnection) getConnection("guest", "guest"); Session producerSession = con2.createSession(false, Session.CLIENT_ACKNOWLEDGE); MessageProducer producer = producerSession.createProducer(queue); MessageProducer producer2 = producerSession.createProducer(queue2); @@ -231,7 +227,7 @@ public class RecoverTest extends TestCase public void testRecoverInAutoAckListener() throws Exception { - AMQConnection con = new AMQConnection("vm://:1", "guest", "guest", "consumer1", "test"); + AMQConnection con = (AMQConnection) getConnection("guest", "guest"); final Session consumerSession = con.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue queue = 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 da1b46ee2c..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 @@ -20,7 +20,6 @@ package org.apache.qpid.test.unit.basic; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.mina.common.ByteBuffer; @@ -30,6 +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.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 TestCase implements MessageListener +public class BytesMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(BytesMessageTest.class); @@ -64,7 +64,7 @@ public class BytesMessageTest extends TestCase implements MessageListener protected void setUp() throws Exception { super.setUp(); - init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test")); + init((AMQConnection) getConnection("guest", "guest")); } protected void tearDown() throws Exception 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 aff496becf..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 @@ -20,8 +20,6 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.TestCase; - import org.apache.mina.common.ByteBuffer; import org.apache.qpid.client.AMQConnection; @@ -33,6 +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.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +45,7 @@ import javax.jms.MessageProducer; import java.io.IOException; import java.util.ArrayList; -public class FieldTableMessageTest extends TestCase implements MessageListener +public class FieldTableMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(FieldTableMessageTest.class); @@ -61,7 +60,7 @@ public class FieldTableMessageTest extends TestCase implements MessageListener protected void setUp() throws Exception { super.setUp(); - init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test")); + init( (AMQConnection) getConnection("guest", "guest")); } protected void tearDown() throws Exception 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 690ba7f01b..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,10 +19,8 @@ * */ package org.apache.qpid.test.unit.basic.close; - -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.AMQQueue; import org.apache.qpid.client.transport.TransportConnection; @@ -37,7 +35,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; -public class CloseTests extends TestCase +public class CloseTests extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(CloseTests.class); @@ -46,20 +44,16 @@ public class CloseTests extends TestCase protected void setUp() throws Exception { super.setUp(); - - TransportConnection.createVMBroker(1); } protected void tearDown() throws Exception { super.setUp(); - - TransportConnection.killVMBroker(1); } - public void testCloseQueueReceiver() throws AMQException, URLSyntaxException, JMSException + public void testCloseQueueReceiver() throws Exception { - AMQConnection connection = new AMQConnection(BROKER, "guest", "guest", this.getName(), "test"); + AMQConnection connection = (AMQConnection) getConnection("guest", "guest"); Session session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); 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 0e15341615..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 @@ -24,16 +24,14 @@ import javax.jms.JMSException; import javax.jms.QueueSession; import javax.jms.TopicSession; -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.AMQTopic; -import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.testutil.QpidTestCase; -public class AMQConnectionTest extends TestCase +public class AMQConnectionTest extends QpidTestCase { private static AMQConnection _connection; private static AMQTopic _topic; @@ -44,8 +42,7 @@ public class AMQConnectionTest extends TestCase protected void setUp() throws Exception { super.setUp(); - TransportConnection.createVMBroker(1); - _connection = new AMQConnection("vm://:1", "guest", "guest", "fred", "test"); + _connection = (AMQConnection) getConnection("guest", "guest"); _topic = new AMQTopic(_connection.getDefaultTopicExchangeName(), new AMQShortString("mytopic")); _queue = new AMQQueue(_connection.getDefaultQueueExchangeName(), new AMQShortString("myqueue")); } @@ -53,15 +50,6 @@ public class AMQConnectionTest extends TestCase protected void tearDown() throws Exception { super.tearDown(); - try - { - _connection.close(); - } - catch (JMSException e) - { - //ignore - } - TransportConnection.killAllVMBrokers(); } /** 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 78b7976f55..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 @@ -24,18 +24,17 @@ import javax.jms.JMSException; import javax.jms.QueueReceiver; import javax.jms.TopicSubscriber; -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.AMQTopic; import org.apache.qpid.testutil.VMBrokerSetup; +import org.apache.qpid.testutil.QpidTestCase; /** * Tests for QueueReceiver and TopicSubscriber creation methods on AMQSession */ -public class AMQSessionTest extends TestCase +public class AMQSessionTest extends QpidTestCase { private static AMQSession _session; @@ -46,7 +45,7 @@ public class AMQSessionTest extends TestCase protected void setUp() throws Exception { super.setUp(); - _connection = new AMQConnection("vm://:1", "guest", "guest", "fred", "test"); + _connection = (AMQConnection) getConnection("guest", "guest"); _topic = new AMQTopic(_connection,"mytopic"); _queue = new AMQQueue(_connection,"myqueue"); _session = (AMQSession) _connection.createSession(false, AMQSession.NO_ACKNOWLEDGE); @@ -76,11 +75,18 @@ public class AMQSessionTest extends TestCase public void testCreateDurableSubscriber() throws JMSException { - TopicSubscriber subscriber = _session.createDurableSubscriber(_topic, "mysubname"); - assertEquals("Topic names should match from durable TopicSubscriber", _topic.getTopicName(), subscriber.getTopic().getTopicName()); + try + { + TopicSubscriber subscriber = _session.createDurableSubscriber(_topic, "mysubname"); + assertEquals("Topic names should match from durable TopicSubscriber", _topic.getTopicName(), subscriber.getTopic().getTopicName()); - subscriber = _session.createDurableSubscriber(_topic, "mysubname", "abc", false); - assertEquals("Topic names should match from durable TopicSubscriber with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName()); + subscriber = _session.createDurableSubscriber(_topic, "mysubname", "abc", false); + assertEquals("Topic names should match from durable TopicSubscriber with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName()); + } + catch (Throwable e) + { + e.printStackTrace(); + } } public void testCreateQueueReceiver() throws JMSException 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 6753ed48e4..b151aea8ae 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 @@ -20,13 +20,12 @@ */ package org.apache.qpid.test.unit.client.channelclose; -import junit.framework.TestCase; - 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.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,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 TestCase +public class ChannelCloseOkTest extends QpidTestCase { private AMQConnection _connection; private Destination _destination1; @@ -75,7 +74,7 @@ public class ChannelCloseOkTest extends TestCase super.setUp(); TransportConnection.createVMBroker(1); - _connection = new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test"); + _connection = (AMQConnection) getConnection("guest", "guest"); _destination1 = new AMQQueue(_connection, "q1", true); _destination2 = new AMQQueue(_connection, "q2", true); -- cgit v1.2.1