QPID-4390: Change VHC to store the default HOUSEKEEPING_CHECK_PERIOD. Clear the current actor in tear down if test sets the current actor

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1433439 13f79535-47bb-0310-9956-ffa450edef68

29 files changed, 177 insertions, 63 deletions

diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
index acc0583f18..a75a01c37d 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
@@ -80,7 +80,7 @@ public class BDBHAMessageStoreTest extends QpidTestCase
         // create virtual host configuration, registry and host instance
         addVirtualHostConfiguration();
         String vhostName = "test" + _masterPort;
-        VirtualHostConfiguration configuration = new VirtualHostConfiguration(vhostName, _configXml.subset("virtualhosts.virtualhost." + vhostName), mock(Broker.class));
+        VirtualHostConfiguration configuration = new VirtualHostConfiguration(vhostName, _configXml.subset("virtualhosts.virtualhost." + vhostName), BrokerTestHelper.createBrokerMock());
         _virtualHost = BrokerTestHelper.createVirtualHost(configuration);
         BDBHAMessageStore store = (BDBHAMessageStore) _virtualHost.getMessageStore();
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 7b5729195f..60169e0165 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -61,7 +61,7 @@ public class ServerConfiguration extends AbstractConfiguration
     public static final String QPID_WORK = "QPID_WORK";
     public static final String LIB_DIR = "lib";
 
-    private Map<String, VirtualHostConfiguration> _virtualHosts = new HashMap<String, VirtualHostConfiguration>();
+    private Map<String, Configuration> _virtualHosts = new HashMap<String, Configuration>();
 
     private File _configFile;
     private File _vhostsFile;
@@ -291,8 +291,7 @@ public class ServerConfiguration extends AbstractConfiguration
             String name = (String) hosts.get(j);
 
             // Add the virtual hosts to the server configuration
-            VirtualHostConfiguration virtualhost = new VirtualHostConfiguration(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)), null);
-            _virtualHosts.put(virtualhost.getName(), virtualhost);
+            _virtualHosts.put(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)));
         }
     }
 
@@ -379,14 +378,14 @@ public class ServerConfiguration extends AbstractConfiguration
         return _virtualHosts.keySet().toArray(new String[_virtualHosts.size()]);
     }
 
-    public VirtualHostConfiguration getVirtualHostConfig(String name)
+    public Configuration getVirtualHostConfig(String name)
     {
         return _virtualHosts.get(name);
     }
 
-    public void setVirtualHostConfig(VirtualHostConfiguration config)
+    public void setVirtualHostConfig(String name, Configuration config)
     {
-        _virtualHosts.put(config.getName(), config);
+        _virtualHosts.put(name, config);
     }
 
     public String getDefaultAuthenticationManager()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index bde6047a0a..eada676b65 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -40,18 +40,25 @@ public class VirtualHostConfiguration extends AbstractConfiguration
     private final Map<String, QueueConfiguration> _queues = new HashMap<String, QueueConfiguration>();
     private final Map<String, ExchangeConfiguration> _exchanges = new HashMap<String, ExchangeConfiguration>();
     private final Broker _broker;
+    private final long _defaultHouseKeepingCheckPeriod;
 
     public VirtualHostConfiguration(String name, Configuration config, Broker broker) throws ConfigurationException
     {
         _name = name;
         _broker = broker;
+
+        // store value of this attribute for running life of virtual host since updating of this value has no run-time effect
+        _defaultHouseKeepingCheckPeriod = ((Number)_broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).longValue();
         setConfiguration(config);
     }
 
     public VirtualHostConfiguration(String name, File configurationFile, Broker broker) throws ConfigurationException
     {
-        _name = name;
-        _broker = broker;
+        this(name, loadConfiguration(name, configurationFile), broker);
+    }
+
+    private static Configuration loadConfiguration(String name, File configurationFile) throws ConfigurationException
+    {
         Configuration configuration = null;
         if (configurationFile == null)
         {
@@ -73,7 +80,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
                 configuration = config;
             }
         }
-        setConfiguration(configuration);
+        return configuration;
     }
 
     /**
@@ -113,7 +120,7 @@ public class VirtualHostConfiguration extends AbstractConfiguration
 
     public long getHousekeepingCheckPeriod()
     {
-        return getLongValue("housekeeping.checkPeriod", getBrokerAttributeAsLong(Broker.HOUSEKEEPING_CHECK_PERIOD));
+        return getLongValue("housekeeping.checkPeriod", _defaultHouseKeepingCheckPeriod);
     }
 
     public Configuration getStoreConfiguration()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
index d4b6d18a0d..9f679b96f3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
@@ -317,16 +317,16 @@ public class XMLConfigurationEntryStore implements ConfigurationEntryStore
 
     private void createVirtualHostConfig(ServerConfiguration serverConfiguration, Map<UUID, ConfigurationEntry> rootChildren)
     {
+        File configuration = serverConfiguration.getVirtualHostsFile();
         for (String name : serverConfiguration.getVirtualHostsNames())
         {
             Map<String, Object> attributes = new HashMap<String, Object>();
             attributes.put(org.apache.qpid.server.model.VirtualHost.NAME, name);
-            File configuration = serverConfiguration.getVirtualHostsFile();
             if (configuration == null)
             {
                 try
                 {
-                    HierarchicalConfiguration virtualHostConfig = ConfigurationUtils.convertToHierarchical(serverConfiguration.getVirtualHostConfig(name).getConfig());
+                    HierarchicalConfiguration virtualHostConfig = ConfigurationUtils.convertToHierarchical(serverConfiguration.getVirtualHostConfig(name));
                     virtualHostConfig.getRootNode().setName(name);
                     configuration = File.createTempFile("_virtualhost", ".xml");
                     XMLConfiguration config = new XMLConfiguration();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
index b36f8645bc..4283428253 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderFactory.java
@@ -75,7 +75,7 @@ public class AuthenticationProviderFactory
             }
         }
 
-        throw new IllegalArgumentException("No factories found for configuration attributes " + attributes);
+        throw new IllegalArgumentException("No authentication provider factory found for configuration attributes " + attributes);
     }
 
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
index 55f23362dc..e10bdbbb35 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQChannelTest.java
@@ -52,6 +52,7 @@ public class AMQChannelTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _virtualHost = BrokerTestHelper.createVirtualHost(getTestName());
         _broker = BrokerTestHelper.createBrokerMock();
         _protocolSession = new InternalTestProtocolSession(_virtualHost, _broker)
@@ -79,6 +80,7 @@ public class AMQChannelTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
index 9081dc49d6..af06c517db 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
@@ -98,4 +98,10 @@ public class TransactionTimeoutHelperTest extends QpidTestCase
         _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject);
     }
 
+    @Override
+    protected void tearDown() throws Exception
+    {
+        CurrentActor.remove();
+        super.tearDown();
+    }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
index b6454b6087..4d6d60906d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
@@ -47,6 +47,7 @@ public class AcknowledgeTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _channel = BrokerTestHelper.createChannel();
         VirtualHost virtualHost = _channel.getVirtualHost();
         _queueName = getTestName();
@@ -68,6 +69,7 @@ public class AcknowledgeTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
index eb407d35b3..0bb65479ce 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.configuration;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import junit.framework.TestCase;
@@ -29,6 +28,7 @@ import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.util.BrokerTestHelper;
 
 public class QueueConfigurationTest extends TestCase
 {
@@ -37,9 +37,12 @@ public class QueueConfigurationTest extends TestCase
     private VirtualHostConfiguration _fullHostConf;
     private Broker _broker;
 
+    @Override
     public void setUp() throws Exception
     {
-        _broker = mock(Broker.class);
+        super.setUp();
+        BrokerTestHelper.setUp();
+        _broker = BrokerTestHelper.createBrokerMock();
         _env = new PropertiesConfiguration();
         _emptyConf = new VirtualHostConfiguration("test", _env, _broker);
 
@@ -56,6 +59,13 @@ public class QueueConfigurationTest extends TestCase
 
     }
 
+    @Override
+    public void tearDown() throws Exception
+    {
+        BrokerTestHelper.tearDown();
+        super.tearDown();
+    }
+
     public void testMaxDeliveryCount() throws Exception
     {
         // broker MAXIMUM_DELIVERY_ATTEMPTS attribute is not set
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 9ce6ab5035..295ae639a7 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.configuration;
 
+import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
 
@@ -33,6 +34,7 @@ import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.stats.StatisticsGatherer;
+import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.test.utils.QpidTestCase;
@@ -53,17 +55,21 @@ public class ServerConfigurationTest extends QpidTestCase
 {
     private XMLConfiguration _config = new XMLConfiguration();
     private ServerConfiguration _serverConfig = null;
+    private Broker _broker;
 
     @Override
     protected void setUp() throws Exception
     {
         super.setUp();
         _serverConfig = new ServerConfiguration(_config);
+        BrokerTestHelper.setUp();
+        _broker = BrokerTestHelper.createBrokerMock();
     }
 
     @Override
     protected void tearDown() throws Exception
     {
+        BrokerTestHelper.tearDown();
         super.tearDown();
     }
 
@@ -1001,10 +1007,10 @@ public class ServerConfigurationTest extends QpidTestCase
         config.initialise();
         
         // Test config
-        VirtualHostConfiguration virtualHost = config.getVirtualHostConfig("a");
+        Configuration virtualHost = config.getVirtualHostConfig("a");
 
         assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
-        assertEquals("Incorrect virtualhost name", "a", virtualHost.getName());
+        assertNotNull("Unexpected virtual host configuration", virtualHost);
     }
 
     /**
@@ -1037,12 +1043,12 @@ public class ServerConfigurationTest extends QpidTestCase
         // Load config
         ServerConfiguration config = new ServerConfiguration(mainFile.getAbsoluteFile());
         config.initialise();
-        
+
         // Test config
-        VirtualHostConfiguration virtualHost = config.getVirtualHostConfig("one");
+        Configuration virtualHost = config.getVirtualHostConfig("one");
 
         assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
-        assertEquals("Incorrect virtualhost name", "one", virtualHost.getName());
+        assertNotNull("Unexpected virtual host configuration", virtualHost);
     }
 
     /**
@@ -1091,11 +1097,11 @@ public class ServerConfigurationTest extends QpidTestCase
         // Load config
         ServerConfiguration config = new ServerConfiguration(mainFile.getAbsoluteFile());
         config.initialise();
-        
+
         // Test config
-        VirtualHostConfiguration testHost = config.getVirtualHostConfig("test");
+        VirtualHostConfiguration testHost = new VirtualHostConfiguration("test", config.getVirtualHostConfig("test"), _broker);
         ExchangeConfiguration testExchange = testHost.getExchangeConfiguration("test.topic");
-        VirtualHostConfiguration fishHost = config.getVirtualHostConfig("fish");
+        VirtualHostConfiguration fishHost = new VirtualHostConfiguration("fish", config.getVirtualHostConfig("fish"), _broker);
         ExchangeConfiguration fishExchange = fishHost.getExchangeConfiguration("fish.topic");
 
         assertEquals("Incorrect virtualhost count", 2, config.getVirtualHostsNames().length);
@@ -1147,7 +1153,7 @@ public class ServerConfigurationTest extends QpidTestCase
         config.initialise();
         
         // Test config
-        VirtualHostConfiguration testHost = config.getVirtualHostConfig("test");
+        VirtualHostConfiguration testHost = new VirtualHostConfiguration("test", config.getVirtualHostConfig("test"), _broker);
         ExchangeConfiguration testExchange = testHost.getExchangeConfiguration("test.topic");
 
         assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
@@ -1185,7 +1191,7 @@ public class ServerConfigurationTest extends QpidTestCase
         config.initialise();
         
         // Test config
-        VirtualHostConfiguration oneHost = config.getVirtualHostConfig("test-one");
+        VirtualHostConfiguration oneHost =  new VirtualHostConfiguration("test-one", config.getVirtualHostConfig("test-one"), _broker);
 
         assertEquals("Incorrect virtualhost count", 1, config.getVirtualHostsNames().length);
         assertEquals("Incorrect virtualhost name", "test-one", oneHost.getName());
@@ -1391,11 +1397,10 @@ public class ServerConfigurationTest extends QpidTestCase
         ServerConfiguration serverConfiguration = new ServerConfiguration(xml);
         serverConfiguration.initialise();
 
-        Broker broker = mock(Broker.class);
-        when(broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
-        VirtualHostConfiguration test = new VirtualHostConfiguration("test", serverConfiguration.getVirtualHostConfig("test").getConfig(), broker );
+        when(_broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
+        VirtualHostConfiguration test = new VirtualHostConfiguration("test", serverConfiguration.getVirtualHostConfig("test"), _broker );
         assertNotNull("Host 'test' is not found", test);
-        VirtualHostConfiguration extra = new VirtualHostConfiguration("extra", serverConfiguration.getVirtualHostConfig("extra").getConfig(), broker);
+        VirtualHostConfiguration extra = new VirtualHostConfiguration("extra", serverConfiguration.getVirtualHostConfig("extra"), _broker);
         assertNotNull("Host 'extra' is not found", test);
 
         QueueConfiguration biggles = test.getQueueConfiguration("biggles");
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index 56c4b96570..5a28e59cc9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
@@ -47,6 +47,7 @@ public class VirtualHostConfigurationTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _configXml = new XMLConfiguration();
         _configXml.addProperty("security." + TestAuthenticationManagerFactory.TEST_AUTH_MANAGER_MARKER, "");
         _configXml.addProperty("virtualhosts.virtualhost(-1).name", getName());
@@ -68,6 +69,7 @@ public class VirtualHostConfigurationTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 12648cfe65..0bb698a46c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -72,7 +72,7 @@ public class AbstractHeadersExchangeTestBase extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
-
+        BrokerTestHelper.setUp();
         _virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName());
     }
 
@@ -88,6 +88,7 @@ public class AbstractHeadersExchangeTestBase extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index e4178d770c..bd6a02d69b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -33,10 +33,17 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
     public void setUp() throws Exception
     {
         super.setUp();
-
+        BrokerTestHelper.setUp();
         _protocolSession = new InternalTestProtocolSession(getVirtualHost(), BrokerTestHelper.createBrokerMock());
     }
 
+    @Override
+    public void tearDown() throws Exception
+    {
+        BrokerTestHelper.tearDown();
+        super.tearDown();
+    }
+
     public void testSimple() throws AMQException
     {
         TestQueue q1 = bindDefault("F0000");
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 997db95c6f..f1bf632235 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -53,6 +53,7 @@ public class TopicExchangeTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _exchange = new TopicExchange();
         _vhost = BrokerTestHelper.createVirtualHost(getName());
         _store = new MemoryMessageStore();
@@ -70,6 +71,7 @@ public class TopicExchangeTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index dc51a59ff9..09dd48e4d3 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
@@ -31,8 +31,9 @@ public class BaseConnectionActorTestCase extends BaseActorTestCase
     public void setUp() throws Exception
     {
         super.setUp();
-
+        BrokerTestHelper.setUp();
         _session = BrokerTestHelper.createSession();
+
         setAmqpActor(new AMQPConnectionActor(_session, getRootLogger()));
     }
 
@@ -48,6 +49,7 @@ public class BaseConnectionActorTestCase extends BaseActorTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
index ac4588b9bb..229d75c69f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
@@ -29,6 +29,7 @@ import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.logging.UnitTestMessageLogger;
 import org.apache.qpid.server.logging.actors.TestLogActor;
 import org.apache.qpid.server.logging.subjects.TestBlankSubject;
+import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.util.List;
@@ -49,6 +50,14 @@ public abstract class AbstractTestMessages extends QpidTestCase
         _logger = new UnitTestMessageLogger();
 
         _actor = new TestLogActor(_logger);
+        BrokerTestHelper.setUp();
+    }
+
+    @Override
+    public void tearDown() throws Exception
+    {
+        BrokerTestHelper.tearDown();
+        super.tearDown();
     }
 
     protected List<Object> performLog()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index b05c81415b..193e8a490d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -30,6 +30,7 @@ import org.apache.qpid.server.logging.UnitTestMessageLogger;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.TestLogActor;
 import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 
@@ -51,8 +52,16 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
     protected LogSubject _subject = null;
 
     @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        BrokerTestHelper.setUp();
+    }
+
+    @Override
     public void tearDown() throws Exception
     {
+        BrokerTestHelper.tearDown();
         try
         {
             CurrentActor.removeAll();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
index 6f5ac4e212..99dd42e179 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
@@ -35,6 +35,7 @@ public class MaxChannelsTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _session = BrokerTestHelper.createSession();
     }
 
@@ -75,6 +76,7 @@ public class MaxChannelsTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
index ea6146a44d..02b8c74feb 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
@@ -43,7 +43,7 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-
+        BrokerTestHelper.setUp();
         _broker = BrokerTestHelper.createBrokerMock();
         VirtualHostRegistry virtualHostRegistry = _broker.getVirtualHostRegistry();
         when(_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST)).thenReturn("default");
@@ -55,8 +55,15 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
     @Override
     protected void tearDown() throws Exception
     {
-        _virtualHost.close();
-        super.tearDown();
+        try
+        {
+            _virtualHost.close();
+        }
+        finally
+        {
+            BrokerTestHelper.tearDown();
+            super.tearDown();
+        }
     }
 
     private static final byte[] AMQP_0_8_HEADER =
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 9c44a27160..0f82345271 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.queue;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.apache.commons.configuration.XMLConfiguration;
@@ -51,11 +50,12 @@ public class AMQQueueFactoryTest extends QpidTestCase
     {
         super.setUp();
 
+        BrokerTestHelper.setUp();
         XMLConfiguration configXml = new XMLConfiguration();
         configXml.addProperty("store.class", TestableMemoryMessageStore.class.getName());
 
 
-        Broker broker = mock(Broker.class);
+        Broker broker = BrokerTestHelper.createBrokerMock();
         if (getName().equals("testDeadLetterQueueDoesNotInheritDLQorMDCSettings"))
         {
             when(broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(5);
@@ -73,11 +73,12 @@ public class AMQQueueFactoryTest extends QpidTestCase
     {
         try
         {
-            super.tearDown();
+            _virtualHost.close();
         }
         finally
         {
-            _virtualHost.close();
+            BrokerTestHelper.tearDown();
+            super.tearDown();
         }
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
index c41adb503e..cbbf183232 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
@@ -68,6 +68,7 @@ public class AckTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _channel = BrokerTestHelper.createChannel(5);
         _protocolSession = _channel.getProtocolSession();
         _virtualHost = _protocolSession.getVirtualHost();
@@ -75,6 +76,13 @@ public class AckTest extends QpidTestCase
         _messageStore = (TestableMemoryMessageStore)_virtualHost.getMessageStore();
     }
 
+    @Override
+    protected void tearDown() throws Exception
+    {
+        BrokerTestHelper.tearDown();
+        super.tearDown();
+    }
+
     private void publishMessages(int count) throws AMQException
     {
         publishMessages(count, false);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 85b7ac3f13..2b60aea208 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -104,6 +104,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
 
         _virtualHost = BrokerTestHelper.createVirtualHost(getClass().getName());
 
@@ -116,9 +117,16 @@ public class SimpleAMQQueueTest extends QpidTestCase
     @Override
     public void tearDown() throws Exception
     {
-        _queue.stop();
-        _virtualHost.close();
-        super.tearDown();
+        try
+        {
+            _queue.stop();
+            _virtualHost.close();
+        }
+        finally
+        {
+            BrokerTestHelper.tearDown();
+            super.tearDown();
+        }
     }
 
     public void testCreateQueue() throws AMQException
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
index 2d3cd7676f..4abb7233dc 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
@@ -29,6 +29,20 @@ import org.apache.qpid.test.utils.QpidTestCase;
 public class SimpleAMQQueueThreadPoolTest extends QpidTestCase
 {
 
+    @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        BrokerTestHelper.setUp();
+    }
+
+    @Override
+    public void tearDown() throws Exception
+    {
+        BrokerTestHelper.tearDown();
+        super.tearDown();
+    }
+
     public void test() throws Exception
     {
         int initialCount = ReferenceCountingExecutorService.getInstance().getReferenceCount();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 3bb8652653..a957d6bf6c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.store;
 
-import static org.mockito.Mockito.mock;
 
 import org.apache.commons.configuration.PropertiesConfiguration;
 
@@ -104,6 +103,7 @@ public class MessageStoreTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
 
         String storePath = System.getProperty("QPID_WORK") + File.separator + getName();
         
@@ -113,7 +113,8 @@ public class MessageStoreTest extends QpidTestCase
 
         cleanup(new File(storePath));
 
-        _broker = mock(Broker.class);
+        _broker = BrokerTestHelper.createBrokerMock();
+
         reloadVirtualHost();
     }
 
@@ -129,6 +130,7 @@ public class MessageStoreTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
index 52bb4d877a..d35a90e3c8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
@@ -49,6 +49,7 @@ public class QueueBrowserUsesNoAckTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _channel = BrokerTestHelper.createChannel();
         VirtualHost virtualHost = _channel.getVirtualHost();
         _queueName = getTestName();
@@ -70,6 +71,7 @@ public class QueueBrowserUsesNoAckTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java
index 5f8626a34b..89d434e95d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/SubscriptionFactoryImplTest.java
@@ -49,6 +49,7 @@ public class SubscriptionFactoryImplTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _channel = BrokerTestHelper.createChannel();
         _session = _channel.getProtocolSession();
         GenericActor.setDefaultMessageLogger(new UnitTestMessageLogger(false));
@@ -66,6 +67,7 @@ public class SubscriptionFactoryImplTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
index b33c82375c..3389773ff8 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerSessionTest.java
@@ -34,6 +34,7 @@ public class ServerSessionTest extends QpidTestCase
     public void setUp() throws Exception
     {
         super.setUp();
+        BrokerTestHelper.setUp();
         _virtualHost = BrokerTestHelper.createVirtualHost(getName());
         GenericActor.setDefaultMessageLogger(CurrentActor.get().getRootMessageLogger());
     }
@@ -50,6 +51,7 @@ public class ServerSessionTest extends QpidTestCase
         }
         finally
         {
+            BrokerTestHelper.tearDown();
             super.tearDown();
         }
     }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index 8480a8e225..f510dcba4a 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
@@ -66,15 +66,13 @@ public class BrokerTestHelper
     protected static final String BROKER_STORE_CLASS_NAME_KEY = "brokerstore.class.name";
     protected static final String JSON_BROKER_STORE_CLASS_NAME = JsonConfigurationEntryStore.class.getName();
 
-
     public static Broker createBrokerMock()
     {
-        setCurrentActorIfNecessary();
-
         SubjectCreator subjectCreator = mock(SubjectCreator.class);
         when(subjectCreator.getMechanisms()).thenReturn("");
         Broker broker = mock(Broker.class);
         when(broker.getAttribute(Broker.SESSION_COUNT_LIMIT)).thenReturn(1);
+        when(broker.getAttribute(Broker.HOUSEKEEPING_CHECK_PERIOD)).thenReturn(10000l);
         when(broker.getId()).thenReturn(UUID.randomUUID());
         when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator);
         RootMessageLogger rootMessageLogger = CurrentActor.get().getRootMessageLogger();
@@ -85,18 +83,19 @@ public class BrokerTestHelper
         return broker;
     }
 
-    public static void setCurrentActorIfNecessary()
+    public static void setUp()
     {
-        if (CurrentActor.get() == null)
-        {
-            CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
-        }
+       CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
+    }
+
+    public static void tearDown()
+    {
+        CurrentActor.remove();
     }
 
     public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration, VirtualHostRegistry virtualHostRegistry)
             throws Exception
     {
-        setCurrentActorIfNecessary();
         StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
         VirtualHost host = new VirtualHostImpl(virtualHostRegistry, statisticsGatherer, new SecurityManager(null), virtualHostConfiguration);
         virtualHostRegistry.registerVirtualHost(host);
@@ -105,8 +104,6 @@ public class BrokerTestHelper
 
     public static VirtualHost createVirtualHost(VirtualHostConfiguration virtualHostConfiguration) throws Exception
     {
-        setCurrentActorIfNecessary();
-
         return new VirtualHostImpl(null, mock(StatisticsGatherer.class), new SecurityManager(null), virtualHostConfiguration);
     }
 
@@ -124,7 +121,7 @@ public class BrokerTestHelper
 
     private static VirtualHostConfiguration createVirtualHostConfiguration(String name) throws ConfigurationException
     {
-        VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, new PropertiesConfiguration(), mock(Broker.class));
+        VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(name, new PropertiesConfiguration(), createBrokerMock());
         vhostConfig.setMessageStoreClass(TestableMemoryMessageStore.class.getName());
         return vhostConfig;
     }
@@ -160,8 +157,6 @@ public class BrokerTestHelper
 
     public static Exchange createExchange(String hostName) throws Exception
     {
-        setCurrentActorIfNecessary();
-
         SecurityManager securityManager = new SecurityManager(null);
         VirtualHost virtualHost = mock(VirtualHost.class);
         when(virtualHost.getName()).thenReturn(hostName);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
index 77dd91a34c..bac2a1e1b4 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
@@ -45,19 +45,27 @@ public class VirtualHostImplTest extends QpidTestCase
     private VirtualHostRegistry _virtualHostRegistry;
 
     @Override
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        BrokerTestHelper.setUp();
+    }
+
+    @Override
     public void tearDown() throws Exception
     {
         try
         {
-            super.tearDown();
-        }
-        finally
-        {
             if (_virtualHostRegistry != null)
             {
                 _virtualHostRegistry.close();
             }
         }
+        finally
+        {
+            BrokerTestHelper.tearDown();
+            super.tearDown();
+        }
 
     }