From 5334e2ecb49a182aed7a1c28c40f3511deadd39d Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Wed, 24 Oct 2007 08:03:50 +0000 Subject: cahnged for using different destinations git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@587808 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/org/apache/qpid/client/MessageListenerTest.java | 2 +- .../test/java/org/apache/qpid/client/ResetMessageListenerTest.java | 2 +- .../apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java | 2 +- .../test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java | 2 +- .../java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java | 2 +- .../java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java | 4 ++-- .../java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java | 1 + 7 files changed, 8 insertions(+), 7 deletions(-) (limited to 'java/client/src/test') 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 2375d03410..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 @@ -69,7 +69,7 @@ public class MessageListenerTest extends QpidTestCase implements MessageListener Session clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue queue =clientSession.createQueue("queue"); + Queue queue =clientSession.createQueue("message-listener-test-queue"); _consumer = clientSession.createConsumer(queue); 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 5da9413c93..b95f705882 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 @@ -85,7 +85,7 @@ public class ResetMessageListenerTest extends QpidTestCase _clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue queue =_clientSession.createQueue("queue"); + Queue queue =_clientSession.createQueue("reset-message-listener-test-queue"); _consumer1 = _clientSession.createConsumer(queue); 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 c2524c366c..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 @@ -212,7 +212,7 @@ public class ChannelCloseOkTest extends QpidTestCase } try { - received.wait(timeout); + received.wait(timeout); } catch (InterruptedException e) { 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 4c6ca296cd..21890e1ae9 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 @@ -50,7 +50,7 @@ public class MessageRequeueTest extends TestCase protected final int consumeTimeout = 3000; - protected final String queue = "direct://amq.direct//queue"; + protected final String queue = "direct://amq.direct//message-requeue-test-queue"; protected String payload = "Message:"; protected final String BROKER = "vm://:1"; 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 df1f003c4e..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 @@ -92,7 +92,7 @@ public class JMSPropertiesTest extends QpidTestCase con.start(); // get message and check JMS properties - ObjectMessage rm = (ObjectMessage) consumer.receive(); + ObjectMessage rm = (ObjectMessage) consumer.receive(2000); assertNotNull(rm); assertEquals("JMS Correlation ID mismatch", sentMsg.getJMSCorrelationID(), rm.getJMSCorrelationID()); 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 03b862abdd..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 @@ -58,7 +58,7 @@ public class DurableSubscriptionTest extends QpidTestCase public void testUnsubscribe() throws Exception { AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con, "MyTopic"); + AMQTopic topic = new AMQTopic(con, "MyDurableSubscriptionTestTopic"); _logger.info("Create Session 1"); Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE); _logger.info("Create Consumer on Session 1"); @@ -117,7 +117,7 @@ public class DurableSubscriptionTest extends QpidTestCase { AMQConnection con = (AMQConnection) getConnection("guest", "guest"); - AMQTopic topic = new AMQTopic(con, "MyTopic"); + AMQTopic topic = new AMQTopic(con, "MyDurableSubscriptionTestTopic"); Session session1 = con.createSession(false, AMQSession.NO_ACKNOWLEDGE); MessageConsumer consumer1 = session1.createConsumer(topic); 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 7428dbedc2..dad33cfc6d 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 @@ -506,6 +506,7 @@ public class CommitRollbackTest extends QpidTestCase assertNotNull(_consumer.receive(100)); + _session.commit(); } } -- cgit v1.2.1