QPID-4390: move the work dir defaulting and configuration fully within BrokerOptions

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

2 files changed, 63 insertions, 4 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 16b459b5d4..9105f5b2e7 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
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.server;
 
+import java.io.File;
+
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class BrokerOptionsTest extends QpidTestCase
@@ -42,14 +44,39 @@ public class BrokerOptionsTest extends QpidTestCase
         assertEquals("dby", _options.getConfigurationStoreType());
     }
 
-    public void testDefaultConfigurationStoreLocation()
+    public void testDefaultConfigurationStoreLocationWithQpidWork()
+    {
+        String qpidWork = "/test/value";
+        setTestSystemProperty("QPID_WORK", qpidWork);
+
+        String expectedPath = new File(qpidWork, BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + "." + BrokerOptions.DEFAULT_STORE_TYPE).getAbsolutePath();
+        assertEquals (expectedPath, _options.getConfigurationStoreLocation());
+    }
+
+    public void testDefaultConfigurationStoreLocationWithoutQpidWork()
     {
-        assertNull(_options.getConfigurationStoreLocation());
+        setTestSystemProperty("QPID_WORK", null);
+        String userDir = System.getProperty("user.dir");
+
+        String expectedPath = new File(userDir, "work/" + BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + "." + BrokerOptions.DEFAULT_STORE_TYPE).getAbsolutePath();
+        assertEquals (expectedPath, _options.getConfigurationStoreLocation());
+    }
+
+    public void testDefaultConfigurationStoreLocationWithQpidWorkAndDifferentStoreType()
+    {
+        String qpidWork = "/test/value";
+        setTestSystemProperty("QPID_WORK", qpidWork);
+
+        String storeType = "dby";
+        _options.setConfigurationStoreType(storeType);
+
+        String expectedPath = new File(qpidWork, BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + "." + storeType).getAbsolutePath();
+        assertEquals (expectedPath, _options.getConfigurationStoreLocation());
     }
 
     public void testOverriddenConfigurationStoreLocation()
     {
-        final String testConfigFile = "etc/mytestconfig.xml";
+        final String testConfigFile = "/my/test/store-location.dby";
         _options.setConfigurationStoreLocation(testConfigFile);
         assertEquals(testConfigFile, _options.getConfigurationStoreLocation());
     }
@@ -147,4 +174,28 @@ public class BrokerOptionsTest extends QpidTestCase
         assertEquals(5555, _options.getManagementModeHttpPort());
     }
 
+    public void testDefaultWorkDirWithQpidWork()
+    {
+        String qpidWork = "/test/value";
+        setTestSystemProperty("QPID_WORK", qpidWork);
+
+        String expectedPath = new File(qpidWork).getAbsolutePath();
+        assertEquals (expectedPath, _options.getWorkDir());
+    }
+
+    public void testDefaultWorkDirWithoutQpidWork()
+    {
+        setTestSystemProperty("QPID_WORK", null);
+        String userDir = System.getProperty("user.dir");
+
+        String expectedPath = new File(userDir, "work").getAbsolutePath();
+        assertEquals (expectedPath, _options.getWorkDir());
+    }
+
+    public void testOverriddenWorkDir()
+    {
+        final String testWorkDir = "/my/test/work/dir";
+        _options.setWorkDir(testWorkDir);
+        assertEquals(testWorkDir, _options.getWorkDir());
+    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
index cab54b1310..6ca9a55d7b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
@@ -20,7 +20,10 @@
  */
 package org.apache.qpid.server;
 
+import java.io.File;
+
 import org.apache.commons.cli.CommandLine;
+import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 /**
@@ -34,8 +37,13 @@ public class MainTest extends QpidTestCase
     {
         BrokerOptions options = startDummyMain("");
 
+        String qpidWork = "/qpid/work";
+        setTestSystemProperty(BrokerProperties.PROPERTY_QPID_WORK, qpidWork);
+
+        String expectedStorePath = new File(qpidWork, BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + ".json").getAbsolutePath();
+
         assertEquals("json", options.getConfigurationStoreType());
-        assertEquals(null, options.getConfigurationStoreLocation());
+        assertEquals(expectedStorePath, options.getConfigurationStoreLocation());
         assertEquals(null, options.getLogConfigFile());
         assertEquals(0, options.getLogWatchFrequency());
         assertEquals("json", options.getInitialConfigurationStoreType());