QPID-2125: Make FailoverBaseCase set the second brokers QPID_WORK as a subdirectory of the first instead of /tmp, allowing common cleanBroker() execution via QpidTestCase. Update QueueBrowserAutoAckTest to use the getTestQueueName() helper method instead of creating its own time-based queue names

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

2 files changed, 2 insertions, 5 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
index 62b54d3086..2e625f95c0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
@@ -61,7 +61,7 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase
 
         setupSession();
 
-        _queue = _clientSession.createQueue(getName()+System.currentTimeMillis());
+        _queue = _clientSession.createQueue(getTestQueueName());
         _clientSession.createConsumer(_queue).close();
         
         //Ensure there are no messages on the queue to start with.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index 9a8fb8fde0..440bc31fe9 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
@@ -22,8 +22,6 @@ package org.apache.qpid.test.utils;
 
 import javax.jms.Connection;
 
-import org.apache.qpid.util.FileUtils;
-
 public class FailoverBaseCase extends QpidTestCase
 {
 
@@ -54,7 +52,7 @@ public class FailoverBaseCase extends QpidTestCase
     protected void setUp() throws java.lang.Exception
     {
         super.setUp();
-        setSystemProperty("QPID_WORK", System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+        setSystemProperty("QPID_WORK", System.getProperty("QPID_WORK")+"/"+getFailingPort());
         startBroker(failingPort);
     }
 
@@ -78,7 +76,6 @@ public class FailoverBaseCase extends QpidTestCase
     {
     	stopBroker(_broker.equals(VM)?FAILING_PORT:FAILING_PORT);
         super.tearDown();
-        FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
     }