Author: ritchiem
Date: Fri Aug 7 18:09:38 2009
New Revision: 802121
URL: http://svn.apache.org/viewvc?rev=802121&view=rev
Log:
QPID-2002 : Ensured new Logging tests use a new queue name for each test case
as the durable store is not cleared between tests so subsequent tests
performing a queue create will not see a queue declare if the same name is used
in all test cases.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=802121&r1=802120&r2=802121&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
Fri Aug 7 18:09:38 2009
@@ -87,8 +87,9 @@
*/
public void testQueueCreateDurableExclusive() throws NamingException,
JMSException, IOException
{
+ String queueName= getTestQueueName();
// To force a queue Creation Event we need to create a consumer.
- Queue queue = (Queue)
_session.createQueue("direct://amq.direct/testQueue/testQueue?durable='"+_durable+"'&exclusive='true'");
+ Queue queue = (Queue) _session.createQueue("direct://amq.direct/" +
queueName + "/" + queueName + "?durable='" + _durable + "'&exclusive='true'");
_session.createConsumer(queue);
@@ -136,9 +137,10 @@
*/
public void testQueueCreateDurable() throws NamingException, JMSException,
IOException
{
- // To force a queue Creation Event we need to create a consumer.
+ String queueName = getTestQueueName();
- Queue queue = (Queue)
_session.createQueue("direct://amq.direct/testQueue/testQueue?durable='"+_durable+"'");
+ // To force a queue Creation Event we need to create a consumer.
+ Queue queue = (Queue) _session.createQueue("direct://amq.direct/" +
queueName + "/" + queueName + "?durable='" + _durable + "'");
_session.createConsumer(queue);
@@ -187,9 +189,9 @@
*/
public void testQueueCreatePersistentAutoDelete() throws NamingException,
JMSException, IOException
{
+ String queueName = getTestQueueName();
// To force a queue Creation Event we need to create a consumer.
-
- Queue queue = (Queue)
_session.createQueue("direct://amq.direct/testQueue/testQueue?durable='"+_durable+"'&autodelete='true'");
+ Queue queue = (Queue)
_session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='"+_durable+"'&autodelete='true'");
_session.createConsumer(queue);
@@ -247,11 +249,11 @@
final Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put("x-qpid-priorities", PRIORITIES);
// Need to create a queue that does not exist so use test name
- ((AMQSession) _session).createQueue(new AMQShortString(getName()),
false, _durable, false, arguments);
+ ((AMQSession) _session).createQueue(new
AMQShortString(getTestQueueName()), false, _durable, false, arguments);
//Need to create a Consumer to ensure that the log has had time to
write
// as the above Create is Asynchronous
- _session.createConsumer(_session.createQueue(getName()));
+ _session.createConsumer(_session.createQueue(getTestQueueName()));
// Validation
List<String> results = _monitor.findMatches(QUEUE_PREFIX);
@@ -308,11 +310,11 @@
final Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put("x-qpid-priorities", PRIORITIES);
// Need to create a queue that does not exist so use test name
- ((AMQSession) _session).createQueue(new AMQShortString(getName()),
true, _durable, false, arguments);
+ ((AMQSession) _session).createQueue(new
AMQShortString(getTestQueueName()), true, _durable, false, arguments);
//Need to create a Consumer to ensure that the log has had time to
write
// as the above Create is Asynchronous
- _session.createConsumer(_session.createQueue(getName()));
+ _session.createConsumer(_session.createQueue(getTestQueueName()));
// Validation
List<String> results = _monitor.findMatches(QUEUE_PREFIX);
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=802121&r1=802120&r2=802121&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Fri Aug 7 18:09:38 2009
@@ -848,6 +848,16 @@
return con;
}
+ /**
+ * Return a uniqueName for this test.
+ * In this case it returns a queue Named by the TestCase and TestName
+ * @return String name for a queue
+ */
+ protected String getTestQueueName()
+ {
+ return getClass().getSimpleName() + "-" + getName();
+ }
+
protected void tearDown() throws java.lang.Exception
{
// close all the connections used by this test.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
