Author: arnaudsimon
Date: Tue Oct 2 09:13:07 2007
New Revision: 581290
URL: http://svn.apache.org/viewvc?rev=581290&view=rev
Log:
Changed to use QpidTestCase
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
Tue Oct 2 09:13:07 2007
@@ -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 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 @@
protected void setUp() throws Exception
{
super.setUp();
- TransportConnection.createVMBroker(1);
_error = null;
count = new AtomicInteger();
}
@@ -58,13 +55,12 @@
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 @@
// ((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 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 @@
// ((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 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 @@
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 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 =
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
Tue Oct 2 09:13:07 2007
@@ -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.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.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 @@
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
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
Tue Oct 2 09:13:07 2007
@@ -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.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 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 @@
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
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
Tue Oct 2 09:13:07 2007
@@ -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.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 @@
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);
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
Tue Oct 2 09:13:07 2007
@@ -24,16 +24,14 @@
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 @@
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 @@
protected void tearDown() throws Exception
{
super.tearDown();
- try
- {
- _connection.close();
- }
- catch (JMSException e)
- {
- //ignore
- }
- TransportConnection.killAllVMBrokers();
}
/**
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
Tue Oct 2 09:13:07 2007
@@ -24,18 +24,17 @@
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 @@
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 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
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java?rev=581290&r1=581289&r2=581290&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
Tue Oct 2 09:13:07 2007
@@ -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 @@
* 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 @@
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);
