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.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@802121 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 21 insertions, 9 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
index ddbed2aab8..5ba7dffcdc 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
@@ -87,8 +87,9 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
      */
     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 class DurableQueueLoggingTest extends AbstractTestLogging
      */
     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 class DurableQueueLoggingTest extends AbstractTestLogging
      */
     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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         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 @@ public class DurableQueueLoggingTest extends AbstractTestLogging
         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);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 10bcb07f6a..cd8071527c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -848,6 +848,16 @@ public class QpidTestCase extends TestCase
         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.