You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2009/10/01 17:20:52 UTC
svn commit: r820685 - in
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test:
client/QueueBrowserAutoAckTest.java utils/FailoverBaseCase.java
Author: robbie
Date: Thu Oct 1 15:20:51 2009
New Revision: 820685
URL: http://svn.apache.org/viewvc?rev=820685&view=rev
Log:
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
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=820685&r1=820684&r2=820685&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java Thu Oct 1 15:20:51 2009
@@ -61,7 +61,7 @@
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.
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=820685&r1=820684&r2=820685&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java Thu Oct 1 15:20:51 2009
@@ -22,8 +22,6 @@
import javax.jms.Connection;
-import org.apache.qpid.util.FileUtils;
-
public class FailoverBaseCase extends QpidTestCase
{
@@ -54,7 +52,7 @@
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 @@
{
stopBroker(_broker.equals(VM)?FAILING_PORT:FAILING_PORT);
super.tearDown();
- FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org