1 files changed, 34 insertions, 40 deletions

diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
index a04fb20680..8e32a1d113 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
+++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
@@ -24,12 +24,8 @@ import java.io.File;
 import java.net.InetAddress;
 
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.SystemOutMessageLogger;
-import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.actors.TestLogActor;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.util.BrokerTestHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.FileUtils;
@@ -51,6 +47,7 @@ public class BDBHAMessageStoreTest extends QpidTestCase
     private int _masterPort;
     private String _host;
     private XMLConfiguration _configXml;
+    private VirtualHost _virtualHost;
 
     public void setUp() throws Exception
     {
@@ -63,41 +60,48 @@ public class BDBHAMessageStoreTest extends QpidTestCase
 
         FileUtils.delete(new File(_workDir), true);
         _configXml = new XMLConfiguration();
-    }
 
-    public void tearDown() throws Exception
-    {
-        FileUtils.delete(new File(_workDir), true);
-        super.tearDown();
-    }
+        BrokerTestHelper.setUp();
+     }
 
-    public void testSetSystemConfiguration() throws Exception
+    public void tearDown() throws Exception
     {
-        // create virtual host configuration, registry and host instance
-        addVirtualHostConfiguration();
-        TestApplicationRegistry registry = initialize();
         try
         {
-            VirtualHost virtualhost = registry.getVirtualHostRegistry().getVirtualHost("test" + _masterPort);
-            BDBHAMessageStore store = (BDBHAMessageStore) virtualhost.getMessageStore();
-
-            // test whether JVM system settings were applied
-            Environment env = store.getEnvironment();
-            assertEquals("Unexpected number of cleaner threads", TEST_NUMBER_OF_THREADS, env.getConfig().getConfigParam(EnvironmentConfig.CLEANER_THREADS));
-            assertEquals("Unexpected log file max", TEST_LOG_FILE_MAX, env.getConfig().getConfigParam(EnvironmentConfig.LOG_FILE_MAX));
-
-            ReplicatedEnvironment repEnv = store.getReplicatedEnvironment();
-            assertEquals("Unexpected number of elections primary retries", TEST_ELECTION_RETRIES,
-                    repEnv.getConfig().getConfigParam(ReplicationConfig.ELECTIONS_PRIMARY_RETRIES));
-            assertEquals("Unexpected number of elections primary retries", TEST_ENV_CONSISTENCY_TIMEOUT,
-                    repEnv.getConfig().getConfigParam(ReplicationConfig.ENV_CONSISTENCY_TIMEOUT));
+            FileUtils.delete(new File(_workDir), true);
+            if (_virtualHost != null)
+            {
+                _virtualHost.close();
+            }
         }
         finally
         {
-            ApplicationRegistry.remove();
+            BrokerTestHelper.tearDown();
+            super.tearDown();
         }
     }
 
+    public void testSetSystemConfiguration() throws Exception
+    {
+        // create virtual host configuration, registry and host instance
+        addVirtualHostConfiguration();
+        String vhostName = "test" + _masterPort;
+        VirtualHostConfiguration configuration = new VirtualHostConfiguration(vhostName, _configXml.subset("virtualhosts.virtualhost." + vhostName), BrokerTestHelper.createBrokerMock());
+        _virtualHost = BrokerTestHelper.createVirtualHost(configuration);
+        BDBHAMessageStore store = (BDBHAMessageStore) _virtualHost.getMessageStore();
+
+        // test whether JVM system settings were applied
+        Environment env = store.getEnvironment();
+        assertEquals("Unexpected number of cleaner threads", TEST_NUMBER_OF_THREADS, env.getConfig().getConfigParam(EnvironmentConfig.CLEANER_THREADS));
+        assertEquals("Unexpected log file max", TEST_LOG_FILE_MAX, env.getConfig().getConfigParam(EnvironmentConfig.LOG_FILE_MAX));
+
+        ReplicatedEnvironment repEnv = store.getReplicatedEnvironment();
+        assertEquals("Unexpected number of elections primary retries", TEST_ELECTION_RETRIES,
+                repEnv.getConfig().getConfigParam(ReplicationConfig.ELECTIONS_PRIMARY_RETRIES));
+        assertEquals("Unexpected number of elections primary retries", TEST_ENV_CONSISTENCY_TIMEOUT,
+                repEnv.getConfig().getConfigParam(ReplicationConfig.ENV_CONSISTENCY_TIMEOUT));
+    }
+
     private void addVirtualHostConfiguration() throws Exception
     {
         int port = findFreePort();
@@ -152,14 +156,4 @@ public class BDBHAMessageStoreTest extends QpidTestCase
         }
         return _host + ":" + _masterPort;
     }
-
-    private TestApplicationRegistry initialize() throws Exception
-    {
-        CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
-        ServerConfiguration configuration = new ServerConfiguration(_configXml);
-        TestApplicationRegistry registry = new TestApplicationRegistry(configuration);
-        ApplicationRegistry.initialise(registry);
-        registry.getVirtualHostRegistry().setDefaultVirtualHostName("test" + _masterPort);
-        return registry;
-    }
 }