summaryrefslogtreecommitdiff
path: root/qpid/java/broker
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2013-08-09 15:48:11 +0000
committerRobert Godfrey <rgodfrey@apache.org>2013-08-09 15:48:11 +0000
commit9f7baf65d73fb13bde1c8651b4d601c8a492d11a (patch)
treeea69787c31f637d8adb26726ffe1115e6b8cc36f /qpid/java/broker
parentbd5222f861bea865a96f365fc6c9f5582c1c7b2c (diff)
downloadqpid-python-9f7baf65d73fb13bde1c8651b4d601c8a492d11a.tar.gz
QPID-5065 : [Java] tests do not run on Windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1512351 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
-rw-r--r--qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
index 40b253a049..c22fcf4a14 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
@@ -240,11 +240,10 @@ public class BrokerOptionsTest extends QpidTestCase
public void testDefaultWorkDirWithQpidWork()
{
- String qpidWork = "/test/value";
+ String qpidWork = new File(File.separator + "test" + File.separator + "value").getAbsolutePath();
setTestSystemProperty("QPID_WORK", qpidWork);
- String expectedPath = new File(qpidWork).getAbsolutePath();
- assertEquals (expectedPath, _options.getConfigProperties().get(BrokerOptions.QPID_WORK_DIR));
+ assertEquals (qpidWork, _options.getConfigProperties().get(BrokerOptions.QPID_WORK_DIR));
}
public void testDefaultWorkDirWithoutQpidWork()
@@ -265,11 +264,10 @@ public class BrokerOptionsTest extends QpidTestCase
public void testDefaultHomeDirWithQpidHome()
{
- String qpidHome = "/test/value";
+ String qpidHome = new File(File.separator + "test" + File.separator + "value").getAbsolutePath();
setTestSystemProperty("QPID_HOME", qpidHome);
- String expectedPath = new File(qpidHome).getAbsolutePath();
- assertEquals (expectedPath, _options.getConfigProperties().get(BrokerOptions.QPID_HOME_DIR));
+ assertEquals (qpidHome, _options.getConfigProperties().get(BrokerOptions.QPID_HOME_DIR));
assertEquals("unexpected number of entries", 6, _options.getConfigProperties().keySet().size());
}