From 7ffc7a0fd55550cd4a33f7976beae4ca67035ae4 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Wed, 28 Mar 2012 07:58:35 +0000 Subject: QPID-3913: Fix BDBUpgradeTest for spawn test profiles Applied patch from Oleksandr Rudyy git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1306207 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'qpid/java') diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java index a708ceac1c..b906ab2474 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java @@ -69,7 +69,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase public void setUp() throws Exception { assertNotNull("QPID_WORK must be set", QPID_WORK_ORIG); - _storeLocation = QPID_WORK_ORIG + "/bdbstore/test-store"; + _storeLocation = getWorkDirBaseDir() + "/bdbstore/test-store"; //Clear the two target directories if they exist. File directory = new File(_storeLocation); @@ -89,6 +89,11 @@ public class BDBUpgradeTest extends QpidBrokerTestCase super.setUp(); } + private String getWorkDirBaseDir() + { + return QPID_WORK_ORIG + (isInternalBroker() ? "" : "/" + getPort()); + } + /** * Test that the selector applied to the DurableSubscription was successfully * transfered to the new store, and functions as expected with continued use -- cgit v1.2.1