QPID-2632 : Fix test that need to modify the configuration before starting the broker. VHCT needed to ensure that the configuration for the various queue priorities was set. The actors need to be able to en/disable status-updates as required.

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

8 files changed, 133 insertions, 124 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index c74c8d28a0..2a542f2a0d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
@@ -20,59 +20,69 @@
 package org.apache.qpid.server.configuration;
 
 
-import junit.framework.TestCase;
 import org.apache.commons.configuration.XMLConfiguration;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.store.TestableMemoryMessageStore;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
 public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
 {
 
-    private XMLConfiguration  configXml;
-
     @Override
     public void setUp() throws Exception
     {
         super.setUp();
-        // Fill config file with stuff
-        configXml = new XMLConfiguration();
-        configXml.setRootElementName("virtualhosts");
-        configXml.addProperty("virtualhost(-1).name", "test");
+        // Set the default configuration items
+        _configXml.clear();
+        _configXml.addProperty("virtualhosts.virtualhost(-1).name", "test");
+        _configXml.addProperty("virtualhosts.virtualhost(-1).test.store.class", TestableMemoryMessageStore.class.getName());
+
+        _configXml.addProperty("virtualhosts.virtualhost.name", getName());
+        _configXml.addProperty("virtualhosts.virtualhost."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
+    }
+
+    @Override
+    public void createBroker()
+    {
+        // Prevent auto broker startup
     }
 
     public void testQueuePriority() throws Exception
     {
-        configXml.addProperty("virtualhost.testQueuePriority.name", "testQueuePriority");
         // Set up queue with 5 priorities
-        configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "atest");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest(-1).exchange",
                               "amq.direct");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.atest.priorities",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.atest.priorities",
                               "5");
 
         // Set up queue with JMS style priorities
-        configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "ptest");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest(-1).exchange",
                               "amq.direct");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ptest.priority",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ptest.priority",
                                "true");
 
         // Set up queue with no priorities
-        configXml.addProperty("virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues(-1).queue(-1).name(-1)",
                               "ntest");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest(-1).exchange",
                               "amq.direct");
-        configXml.addProperty("virtualhost.testQueuePriority.queues.queue.ntest.priority",
+        _configXml.addProperty("virtualhosts.virtualhost.testQueuePriority.queues.queue.ntest.priority",
                               "false");
 
-        VirtualHost vhost = ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration("testQueuePriority", configXml.subset("virtualhost.testQueuePriority")));
+        // Start the broker now.
+        super.createBroker();
+
+        VirtualHost vhost =
+                ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
 
         // Check that atest was a priority queue with 5 priorities
         AMQQueue atest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
@@ -87,29 +97,29 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
         // Check that ntest wasn't a priority queue
         AMQQueue ntest = vhost.getQueueRegistry().getQueue(new AMQShortString("ntest"));
         assertFalse(ntest instanceof AMQPriorityQueue);
-
-        ApplicationRegistry.remove();
-
     }
 
     public void testQueueAlerts() throws Exception
     {
-        configXml.addProperty("virtualhost.testQueueAlerts.name", "testQueueAlerts");
         // Set up queue with 5 priorities
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.exchange", "amq.topic");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumQueueDepth", "1");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageSize", "2");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.maximumMessageAge", "3");
 
-        configXml.addProperty("virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
-        configXml.addProperty("virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(1).name(1)", "atest");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).exchange", "amq.direct");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumQueueDepth", "4");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageSize", "5");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues.queue.atest(-1).maximumMessageAge", "6");
 
-        configXml.addProperty("virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
+        _configXml.addProperty("virtualhosts.virtualhost.testQueueAlerts.queues(-1).queue(-1).name(-1)", "btest");
 
-        VirtualHost vhost = ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration("testQueueAlerts", configXml.subset("virtualhost.testQueueAlerts")));
+        // Start the broker now.
+        super.createBroker();
+
+        VirtualHost vhost =
+                ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
 
         // Check specifically configured values
         AMQQueue aTest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
@@ -122,8 +132,6 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
         assertEquals(1, bTest.getMaximumQueueDepth());
         assertEquals(2, bTest.getMaximumMessageSize());
         assertEquals(3, bTest.getMaximumMessageAge());
-
-        ApplicationRegistry.remove();
     }
 
     /**
@@ -135,20 +143,17 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
     {
         int initialPoolSize = 10;
 
-        configXml.addProperty("virtualhost.testHouseKeepingThreadCount.name", "testHouseKeepingThreadCount");
-        configXml.addProperty("virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
+        _configXml.addProperty("virtualhosts.virtualhost.testHouseKeepingThreadCount.housekeeping.poolSize",
                               initialPoolSize);
 
-        VirtualHostConfiguration config =
-                new VirtualHostConfiguration("testHouseKeepingThreadCount",
-                                             configXml.subset("virtualhost.testHouseKeepingThreadCount"));
+        // Start the broker now.
+        super.createBroker();
+
         VirtualHost vhost =
-                ApplicationRegistry.getInstance().createVirtualHost(config);
+                ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
 
         assertEquals("HouseKeeping PoolSize not set correctly.",
                      initialPoolSize, vhost.getHouseKeepingPoolSize());
-
-        ApplicationRegistry.remove();
     }
 
     /**
@@ -158,12 +163,11 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
      */
     public void testDefaultHouseKeepingTasks() throws Exception
     {
-        configXml.addProperty("virtualhost.testDefaultHouseKeepingTasks.name", "testDefaultHouseKeepingTasks");
-        VirtualHostConfiguration config =
-                new VirtualHostConfiguration("testDefaultHouseKeepingTasks",
-                                             configXml.subset("virtualhost.testDefaultHouseKeepingTasks"));
+        // Start the broker now.
+        super.createBroker();
+
         VirtualHost vhost =
-                ApplicationRegistry.getInstance().createVirtualHost(config);
+                ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
 
         assertEquals("Default houseKeeping task count incorrect.", 2,
                      vhost.getHouseKeepingTaskCount());
@@ -171,9 +175,6 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
         // Currently the two are tasks:
         // ExpiredMessageTask from VirtualHost        
         // UpdateTask from the QMF ManagementExchange
-
-
-        ApplicationRegistry.remove();
     }
 
     /**
@@ -185,15 +186,14 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
      {
          int initialPoolSize = 10;
 
-         configXml.addProperty("virtualhost.testDynamicHouseKeepingPoolSizeChange.name", "testDynamicHouseKeepingPoolSizeChange");
-         configXml.addProperty("virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
+         _configXml.addProperty("virtualhosts.virtualhost.testDynamicHouseKeepingPoolSizeChange.housekeeping.poolSize",
                                initialPoolSize);
 
-         VirtualHostConfiguration config =
-                 new VirtualHostConfiguration("testHouseKeepingThreadCount",
-                                              configXml.subset("virtualhost.testDynamicHouseKeepingPoolSizeChange"));
+         // Start the broker now.
+         super.createBroker();
+
          VirtualHost vhost =
-                 ApplicationRegistry.getInstance().createVirtualHost(config);
+                 ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost(getName());
 
          assertEquals("HouseKeeping PoolSize not set correctly.",
                       initialPoolSize, vhost.getHouseKeepingPoolSize());
@@ -203,7 +203,6 @@ public class VirtualHostConfigurationTest extends InternalBrokerBaseCase
          assertEquals("HouseKeeping PoolSize not correctly change.",
                       1, vhost.getHouseKeepingPoolSize());
 
-         ApplicationRegistry.remove();
      }
 
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
index 7d1f21e082..2b684ac51b 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
@@ -44,16 +44,27 @@ import java.util.List;
 public class AMQPChannelActorTest extends BaseConnectionActorTestCase
 {
 
-    AMQChannel _channel;
-
     @Override
     public void configure()
     {
-        super.configure();
+        // Prevent defaulting Logging to ON
+    }
+    
+
+    @Override
+    public void createBroker() throws Exception
+    {
+        //prevent auto-broker startup
+    }
+
+    private void startBrokerNow() throws Exception
+    {
+        super.createBroker();
 
         _amqpActor = new AMQPChannelActor(_channel, _rootLogger);
     }
 
+
     /**
      * Test that when logging on behalf of the channel
      * The test sends a message then verifies that it entered the logs.
@@ -61,8 +72,12 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * The log message should be fully repalaced (no '{n}' values) and should
      * contain the channel id ('/ch:1') identification.
      */
-    public void testChannel()
+    public void testChannel() throws Exception
     {
+        _configXml.setProperty("status-updates", "ON");
+
+        startBrokerNow();
+
         final String message = sendTestMessage();
 
         List<Object> logs = _rawLogger.getLogMessages();
@@ -120,16 +135,15 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingOFF() throws ConfigurationException, AMQException
+    public void testChannelLoggingOFF() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "OFF");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "OFF");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        // Start the broker now.
+        startBrokerNow();
+
 
         sendTestMessage();
 
@@ -145,16 +159,13 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingOfF() throws ConfigurationException, AMQException
+    public void testChannelLoggingOfF() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "OfF");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "OfF");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        startBrokerNow();
 
         sendTestMessage();
 
@@ -170,16 +181,13 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingOff() throws ConfigurationException, AMQException
+    public void testChannelLoggingOff() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "Off");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "Off");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        startBrokerNow();
 
         sendTestMessage();
 
@@ -195,16 +203,13 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingofF() throws ConfigurationException, AMQException
+    public void testChannelLoggingofF() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "ofF");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "ofF");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        startBrokerNow();
 
         sendTestMessage();
 
@@ -220,16 +225,13 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingoff() throws ConfigurationException, AMQException
+    public void testChannelLoggingoff() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "off");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "off");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        startBrokerNow();
 
         sendTestMessage();
 
@@ -245,16 +247,13 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
      * @throws ConfigurationException
      * @throws AMQException
      */
-    public void testChannelLoggingoFf() throws ConfigurationException, AMQException
-    {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "oFf");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+    public void testChannelLoggingoFf() throws Exception, AMQException
+    {        
+        _configXml.setProperty("status-updates", "oFf");
 
         _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        startBrokerNow();
 
         sendTestMessage();
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index 013677461b..3e82eea51a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
@@ -41,6 +41,19 @@ import java.util.List;
  */
 public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
 {
+    @Override
+    public void configure()
+    {
+        // Prevent defaulting Logging to ON
+    }
+
+
+    @Override
+    public void createBroker()
+    {
+        //Prevent auto-broker startup
+    }
+
     /**
      * Test the AMQPActor logging as a Connection level.
      *
@@ -49,8 +62,12 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
      * The log message should be fully repalaced (no '{n}' values) and should
      * not contain any channel identification.
      */
-    public void testConnection()
+    public void testConnection() throws Exception
     {
+        _configXml.setProperty("status-updates", "ON");
+
+        super.createBroker();
+
         final String message = sendLogMessage();
 
         List<Object> logs = _rawLogger.getLogMessages();
@@ -75,14 +92,12 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
                     logs.get(0).toString().contains("/ch:"));
     }
 
-    public void testConnectionLoggingOff() throws ConfigurationException, AMQException
+    public void testConnectionLoggingOff() throws Exception, AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        config.addProperty("status-updates", "OFF");
-
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
+        _configXml.setProperty("status-updates", "OFF");
 
-        setUpWithConfig(serverConfig);
+        // Start the broker now.
+        super.createBroker();
 
         sendLogMessage();
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 8170315bc7..5f5cc4fca3 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -20,17 +20,12 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
 import org.apache.qpid.server.logging.RootMessageLogger;
 import org.apache.qpid.server.logging.RootMessageLoggerImpl;
 import org.apache.qpid.server.logging.LogActor;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.util.InternalBrokerBaseCase;
 
 public class BaseActorTestCase extends InternalBrokerBaseCase
@@ -43,6 +38,12 @@ public class BaseActorTestCase extends InternalBrokerBaseCase
     public void configure()
     {
         _configuration.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+    }
+
+    @Override
+    public void createBroker() throws Exception
+    {
+        super.createBroker();
 
         _rawLogger = new UnitTestMessageLogger();
 
@@ -57,9 +58,4 @@ public class BaseActorTestCase extends InternalBrokerBaseCase
         super.tearDown();
     }
 
-    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
-    {
-    }
-
-
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
index d359943d6f..bfdf48337d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
@@ -24,9 +24,9 @@ public class BaseConnectionActorTestCase extends BaseActorTestCase
 {
 
     @Override
-    public void configure()
+    public void createBroker() throws Exception
     {
-        super.configure();
+        super.createBroker();
 
         _amqpActor = new AMQPConnectionActor(_session, _rootLogger);
     }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
index 3f9dc59e67..dec59487db 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
@@ -44,9 +44,9 @@ public class ManagementActorTest extends BaseActorTestCase
     private String _threadName;
 
     @Override
-    public void configure()
+    public void createBroker() throws Exception
     {
-        super.configure();
+        super.createBroker();
         _amqpActor = new ManagementActor(_rootLogger);
 
         // Set the thread name to be the same as a RMI JMX Connection would use
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
index 5001029931..703149a760 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
@@ -32,9 +32,9 @@ public class QueueActorTest extends BaseConnectionActorTestCase
 {
 
     @Override
-    public void configure()
+    public void createBroker() throws Exception
     {
-        super.configure();
+        super.createBroker();
         _amqpActor = new QueueActor(_queue, _rootLogger);
     }
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
index 6a40d96e2e..c3f3d05549 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
@@ -42,9 +42,9 @@ public class SubscriptionActorTest extends BaseConnectionActorTestCase
 {
 
     @Override
-    public void configure()
+    public void createBroker() throws Exception
     {
-        super.configure();
+        super.createBroker();
 
         MockSubscription mockSubscription = new MockSubscription();