Merged r 886719:886722 from 0.5.x-dev.

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

30 files changed, 441 insertions, 364 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
index 0f3f7bd2b5..2044627be7 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
@@ -29,9 +29,11 @@ public class LogMessageTest extends TestCase
 {
 
     /**
-     * Test that the US local is loadable. 
+     * Test that the US local has a loadable bundle.
+     * No longer have a specific en_US bundle so cannot verify that that version
+     * is loaded.
      */
-    public void testUSLocale()
+    public void testBundle()
     {
         Locale usLocal = Locale.US;
         Locale.setDefault(usLocal);
@@ -39,8 +41,6 @@ public class LogMessageTest extends TestCase
                                                             usLocal);
 
         assertNotNull("Unable to load ResourceBundle", _messages);
-
-        assertEquals("Loaded bundle has incorrect locale.", usLocal, _messages.getLocale());
     }
 
     /**
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 46dc677921..ad8b25a4ac 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
@@ -20,83 +20,40 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 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.LogSubject;
 import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.AMQChannel;
 
 import java.util.List;
 
 /**
- * Test : AMQPConnectionActorTest
- * Validate the AMQPConnectionActor class.
+ * Test : AMQPChannelActorTest
+ * Validate the AMQPChannelActor class.
  *
  * The test creates a new AMQPActor and then logs a message using it.
  *
  * The test then verifies that the logged message was the only one created and
  * that the message contains the required message.
  */
-public class AMQPChannelActorTest extends TestCase
+public class AMQPChannelActorTest extends BaseConnectionActorTestCase
 {
 
-    LogActor _amqpActor;
-    UnitTestMessageLogger _rawLogger;
-    AMQProtocolSession _session;
     AMQChannel _channel;
 
-    public void setUp() throws Exception, AMQException
+    @Override
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
     {
-        super.setUp();
-        //Highlight that this test will cause a new AR to be created
-        ApplicationRegistry.getInstance();
-
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");        
-
-        setUpWithConfig(serverConfig);
-    }
-
-    private void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
-    {
-        _rawLogger = new UnitTestMessageLogger();
-        RootMessageLogger rootLogger =
-                new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().
-                    getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
-        // Create a single session for this test.
-        _session = new InternalTestProtocolSession(virtualHost);
-
+        super.setUpWithConfig(serverConfig);
 
         _channel = new AMQChannel(_session, 1, _session.getVirtualHost().getMessageStore());
 
-        _amqpActor = new AMQPChannelActor(_channel, rootLogger);
-
-    }
-
-    public void tearDown() throws Exception
-    {
-        _rawLogger.clearLogMessages();
-        // Correctly Close the AR we created
-        ApplicationRegistry.remove();
-
-        super.tearDown();
+        _amqpActor = new AMQPChannelActor(_channel, _rootLogger);
     }
 
     /**
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 98c14efe4d..013677461b 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
@@ -20,22 +20,13 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import java.util.List;
 
@@ -48,51 +39,8 @@ import java.util.List;
  * The test then verifies that the logged message was the only one created and
  * that the message contains the required message.
  */
-public class AMQPConnectionActorTest extends TestCase
+public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
 {
-
-    LogActor _amqpActor;
-    UnitTestMessageLogger _rawLogger;
-
-    public void setUp() throws Exception, AMQException
-    {
-        super.setUp();
-        //Highlight that this test will cause a new AR to be created
-        ApplicationRegistry.getInstance();
-
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
-        setUpWithConfig(serverConfig);
-    }
-
-    public void tearDown() throws Exception
-    {
-        _rawLogger.clearLogMessages();
-
-        // Correctly Close the AR we created
-        ApplicationRegistry.remove();
-
-        super.tearDown();
-    }
-
-    private void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
-    {
-        _rawLogger = new UnitTestMessageLogger();
-        RootMessageLogger rootLogger =
-                new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().
-                getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
-        // Create a single session for this test.
-        AMQProtocolSession session = new InternalTestProtocolSession(virtualHost);
-
-        _amqpActor = new AMQPConnectionActor(session, rootLogger);
-    }
-
     /**
      * Test the AMQPActor logging as a Connection level.
      *
@@ -114,7 +62,7 @@ public class AMQPConnectionActorTest extends TestCase
                    logs.get(0).toString().contains(message));
 
         // Verify that the message has the correct type
-        assertTrue("Message contains the [con: prefix",
+        assertTrue("Message does not contain the [con: prefix",
                    logs.get(0).toString().contains("[con:"));
 
         // Verify that all the values were presented to the MessageFormatter
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
new file mode 100644
index 0000000000..dd5632f2b0
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -0,0 +1,74 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+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;
+
+public class BaseActorTestCase extends TestCase
+{
+    protected LogActor _amqpActor;
+    protected UnitTestMessageLogger _rawLogger;
+    protected RootMessageLogger _rootLogger;
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        //Highlight that this test will cause a new AR to be created
+        ApplicationRegistry.getInstance();
+
+        Configuration config = new PropertiesConfiguration();
+        ServerConfiguration serverConfig = new ServerConfiguration(config);
+
+        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+
+        setUpWithConfig(serverConfig);
+    }
+
+    public void tearDown() throws Exception
+    {
+        _rawLogger.clearLogMessages();
+
+        // Correctly Close the AR we created
+        ApplicationRegistry.remove();
+
+        super.tearDown();
+    }
+
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    {
+        _rawLogger = new UnitTestMessageLogger();
+
+        _rootLogger =
+                new RootMessageLoggerImpl(serverConfig, _rawLogger);
+    }
+
+
+}
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
new file mode 100644
index 0000000000..6e8ecc1313
--- /dev/null
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
@@ -0,0 +1,50 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging.actors;
+
+import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.protocol.InternalTestProtocolSession;
+import org.apache.qpid.AMQException;
+
+public class BaseConnectionActorTestCase extends BaseActorTestCase
+{
+
+    protected AMQProtocolSession _session;
+
+    @Override
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    {
+        super.setUpWithConfig(serverConfig);
+
+        VirtualHost virtualHost = ApplicationRegistry.getInstance().
+                getVirtualHostRegistry().getVirtualHosts().iterator().next();
+
+        // Create a single session for this test.
+        _session = new InternalTestProtocolSession(virtualHost);
+        
+        _amqpActor = new AMQPConnectionActor(_session, _rootLogger);
+    }
+
+
+}
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 79fdff2dc6..0d7d0c3dba 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
@@ -20,15 +20,11 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.virtualhost.VirtualHost;
 
 /**
  * Test : CurrentActorTest
@@ -51,38 +47,28 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
  * is called before one or more threads call get(). This way we can ensure that
  * the remove does not affect more than the Thread it was called in.
  */
-public class CurrentActorTest extends TestCase
+public class CurrentActorTest extends BaseConnectionActorTestCase
 {
     //Set this to be a reasonably large number
     int THREADS = 10;
 
     // Record any exceptions that are thrown by the threads
-    final Exception[] _errors = new Exception[THREADS];
-
-    // Create a single session for this test.
-    AMQProtocolSession _session;
-
-    public void setUp() throws Exception
-    {
-        super.setUp();
-        // Create a single session for this test.
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().
-                getVirtualHostRegistry().getVirtualHosts().iterator().next();
-
-        // Create a single session for this test.
-        _session = new InternalTestProtocolSession(virtualHost);
-    }
-
-
-    @Override
-    public void tearDown() throws Exception
-    {
-        // Correctly Close the AR we created
-        ApplicationRegistry.remove();
-        super.tearDown();
-    }
-
-
+    Exception[] _errors = new Exception[THREADS];
+
+    /**
+     * Test that CurrentActor behaves as LIFO queue.
+     *
+     * Test creates two Actors Connection and Channel and then sets the
+     * CurrentActor.
+     *
+     * The test validates that CurrentActor remembers the Connection actor
+     * after the Channel actor has been removed.
+     *
+     * And then finally validates that removing the Connection actor results
+     * in there being no actors set.
+     *
+     * @throws AMQException
+     */
     public void testLIFO() throws AMQException
     {
         // Create a new actor using retrieving the rootMessageLogger from
@@ -92,6 +78,12 @@ public class CurrentActorTest extends TestCase
                                                                       ApplicationRegistry.getInstance().
                                                                               getRootMessageLogger());
 
+        /*
+         * Push the actor on to the stack:
+         *
+         *  CurrentActor -> Connection
+         *       Stack   -> null
+         */
         CurrentActor.set(connectionActor);
 
         //Use the Actor to send a simple message
@@ -115,8 +107,12 @@ public class CurrentActorTest extends TestCase
                      connectionActor, CurrentActor.get());
 
         /**
-         * Set the actor to nwo be the Channel actor so testing the ability
-         * to push the actor on to the stack
+         * Set the actor to now be the Channel actor so testing the ability
+         * to push the actor on to the stack:
+         *
+         *  CurrentActor -> Channel
+         *       Stack   -> Connection, null
+         *
          */
 
         AMQChannel channel = new AMQChannel(_session, 1, _session.getVirtualHost().getMessageStore());
@@ -149,6 +145,13 @@ public class CurrentActorTest extends TestCase
 
         // Remove the ChannelActor from the stack
         CurrentActor.remove();
+        /*
+         * Pop the actor on to the stack:
+         *
+         *  CurrentActor -> Connection
+         *       Stack   -> null
+         */
+
 
         // Verify we now have the same connection actor as we set earlier
         assertEquals("Retrieved actor is not as expected ",
@@ -157,18 +160,44 @@ public class CurrentActorTest extends TestCase
         // Verify that removing the our last actor it returns us to the test
         // default that the ApplicationRegistry sets.
         CurrentActor.remove();
+        /*
+         * Pop the actor on to the stack:
+         *
+         *  CurrentActor -> null
+         */
+
 
         assertEquals("CurrentActor not the Test default", TestLogActor.class ,CurrentActor.get().getClass());
     }
 
+    /**
+     * Test the setting CurrentActor is done correctly as a ThreadLocal.
+     *
+     * The test starts 'THREADS' threads that all set the CurrentActor log
+     * a message then remove the actor.
+     *
+     * Checks are done to ensure that there is no set actor after the remove.
+     *
+     * If the ThreadLoacl was not working then having concurrent actor sets
+     * would result in more than one actor and so the remove will not result
+     * in the clearing of the CurrentActor
+     *
+     */
     public void testThreadLocal()
     {
 
+        new Runnable(){
+            public void run()
+            {
+                System.out.println(_errors[0]);
+            }
+        };
+
         // Setup the threads
         Thread[] threads = new Thread[THREADS];
         for (int count = 0; count < THREADS; count++)
         {
-            Runnable test = new Test(count);
+            Runnable test = new LogMessagesWithAConnectionActor(count);
             threads[count] = new Thread(test);
         }
 
@@ -202,11 +231,15 @@ public class CurrentActorTest extends TestCase
         }
     }
 
-    public class Test implements Runnable
+    /**
+     * Creates a new ConnectionActor and logs the given number of messages
+     * before removing the actor and validating that there is no set actor.
+     */
+    public class LogMessagesWithAConnectionActor implements Runnable
     {
         int count;
 
-        Test(int count)
+        LogMessagesWithAConnectionActor(int count)
         {
             this.count = count;
         }
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 9fc1d2a18f..caee84da09 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
@@ -20,60 +20,45 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
+import org.apache.qpid.AMQException;
 
 import java.util.List;
 
 /**
- * Test : AMQPConnectionActorTest
- * Validate the AMQPConnectionActor class.
+ * Test : AMQPManagementActorTest
+ * Validate the AMQPManagementActor class.
  *
  * The test creates a new AMQPActor and then logs a message using it.
  *
  * The test then verifies that the logged message was the only one created and
  * that the message contains the required message.
  */
-public class ManagementActorTest extends TestCase
+public class ManagementActorTest extends BaseActorTestCase
 {
 
-    LogActor _amqpActor;
-    UnitTestMessageLogger _rawLogger;
     private static final String IP = "127.0.0.1";
     private static final String CONNECTION_ID = "1";
     private String _threadName;
 
-    public void setUp() throws ConfigurationException
+    @Override
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
-
-        _rawLogger = new UnitTestMessageLogger();
-        RootMessageLogger rootLogger =
-                new RootMessageLoggerImpl(serverConfig, _rawLogger);
-
-        _amqpActor = new ManagementActor(rootLogger);
+        super.setUpWithConfig(serverConfig);
+        _amqpActor = new ManagementActor(_rootLogger);
 
         // Set the thread name to be the same as a RMI JMX Connection would use
         _threadName = Thread.currentThread().getName();
         Thread.currentThread().setName("RMI TCP Connection(" + CONNECTION_ID + ")-" + IP);
     }
 
-    public void tearDown()
+    @Override
+    public void tearDown() throws Exception
     {
         Thread.currentThread().setName(_threadName);
-        _rawLogger.clearLogMessages();
+        super.tearDown();
     }
 
     /**
@@ -117,7 +102,7 @@ public class ManagementActorTest extends TestCase
                     logs.get(0).toString().contains("{"));
 
         // Verify that the message has the correct type
-        assertTrue("Message contains the [mng: prefix",
+        assertTrue("Message does not contain the [mng: prefix",
                    logs.get(0).toString().contains("[mng:"));
 
         // Verify that the logged message does not contains the 'ch:' marker
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 727b83c60b..bf8fd86f85 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
@@ -20,49 +20,27 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
 import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
 
 import java.util.List;
 
-public class QueueActorTest extends TestCase
+public class QueueActorTest extends BaseConnectionActorTestCase
 {
-    LogActor _amqpActor;
-    UnitTestMessageLogger _rawLogger;
 
-    public void setUp() throws ConfigurationException
+    @Override
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");        
-
-        _rawLogger = new UnitTestMessageLogger();
-        RootMessageLogger rootLogger =
-                new RootMessageLoggerImpl(serverConfig, _rawLogger);
+        super.setUpWithConfig(serverConfig);
 
         MockAMQQueue queue = new MockAMQQueue(getName());
 
-        queue.setVirtualHost(ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next());
+        queue.setVirtualHost(_session.getVirtualHost());
 
-        _amqpActor = new QueueActor(queue, rootLogger);
-    }
-
-    public void tearDown()
-    {
-        _rawLogger.clearLogMessages();
-        ApplicationRegistry.remove();
+        _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 6b09087eef..c86ffd4872 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
@@ -20,23 +20,13 @@
  */
 package org.apache.qpid.server.logging.actors;
 
-import junit.framework.TestCase;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
-import org.apache.qpid.server.logging.RootMessageLoggerImpl;
-import org.apache.qpid.server.logging.rawloggers.UnitTestMessageLogger;
 import org.apache.qpid.server.subscription.MockSubscription;
-import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MockAMQQueue;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.AMQException;
 
-import java.security.Principal;
 import java.util.List;
 
 /**
@@ -48,38 +38,24 @@ import java.util.List;
  * The test then verifies that the logged message was the only one created and
  * that the message contains the required message.
  */
-public class SubscriptionActorTest extends TestCase
+public class SubscriptionActorTest extends BaseConnectionActorTestCase
 {
 
-    LogActor _amqpActor;
-    UnitTestMessageLogger _rawLogger;
-
-    public void setUp() throws ConfigurationException
+    @Override
+    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
     {
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+        super.setUpWithConfig(serverConfig);
 
-        _rawLogger = new UnitTestMessageLogger();
-        RootMessageLogger rootLogger =
-                new RootMessageLoggerImpl(serverConfig, _rawLogger);
 
         MockSubscription mockSubscription = new MockSubscription();
 
         MockAMQQueue queue = new MockAMQQueue(getName());
 
-        queue.setVirtualHost(ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next());
+        queue.setVirtualHost(_session.getVirtualHost());
 
         mockSubscription.setQueue(queue,false);
 
-        _amqpActor = new SubscriptionActor(rootLogger, mockSubscription);
-    }
-
-    public void tearDown()
-    {
-        _rawLogger.clearLogMessages();
-        ApplicationRegistry.remove();
+        _amqpActor = new SubscriptionActor(_rootLogger, mockSubscription);
     }
 
     /**
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
index acab5b28d2..30f4e16e42 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
@@ -27,7 +27,11 @@ public class TestLogActor extends AbstractActor
     public TestLogActor(RootMessageLogger rootLogger)
     {
         super(rootLogger);
-        _logString = "[Test Actor] ";
+    }
+
+    public String getLogMessage()
+    {
+        return "[Test Actor] ";
     }
 }
     
\ No newline at end of file
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
index b9b222755d..25760a6d65 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.logging.messages;
 
 import junit.framework.TestCase;
 import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.logging.LogActor;
@@ -87,9 +86,8 @@ public abstract class AbstractTestMessages extends TestCase
      *
      * @param logs     the logs generated during test run
      * @param tag      the tag to check for
-     * @param expected
+     * @param expected the expected log messages
      *
-     * @return the log message section for further testing
      */
     protected void validateLogMessage(List<Object> logs, String tag, String[] expected)
     {
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
index b2182bb1b2..7a750baf06 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
@@ -22,12 +22,15 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test BND Log Messages
+ */
 public class BindingMessagesTest extends AbstractTestMessages
 {
 
-    public void testMessage1001_NoArgs()
+    public void testBindCreate_NoArgs()
     {
-        _logMessage = BindingMessages.BND_1001(null, false);
+        _logMessage = BindingMessages.BND_CREATED(null, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create"};
@@ -35,11 +38,11 @@ public class BindingMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BND-1001", expected);
     }
 
-    public void testMessage1001_Args()
+    public void testBindCreate_Args()
     {
         String arguments = "arguments";
 
-        _logMessage = BindingMessages.BND_1001(arguments, true);
+        _logMessage = BindingMessages.BND_CREATED(arguments, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create", ": Arguments :", arguments};
@@ -47,9 +50,9 @@ public class BindingMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BND-1001", expected);
     }
         
-    public void testMessage1002()
+    public void testBindDelete()
     {
-        _logMessage = BindingMessages.BND_1002();
+        _logMessage = BindingMessages.BND_DELETED();
 
         List<Object> log = performLog();
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
index 65dcea1e25..17306b2e2a 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
@@ -22,14 +22,17 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test BRK log Messages
+ */
 public class BrokerMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testBrokerStartup()
     {
         String version = "Qpid 0.6";
         String build = "796936M";
 
-        _logMessage = BrokerMessages.BRK_1001(version, build);
+        _logMessage = BrokerMessages.BRK_STARTUP(version, build);
         List<Object> log = performLog();
 
         String[] expected = {"Startup :", "Version:", version, "Build:", build};
@@ -37,12 +40,12 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testBrokerListening()
     {
         String transport = "TCP";
         Integer port = 2765;
 
-        _logMessage = BrokerMessages.BRK_1002(transport, port);
+        _logMessage = BrokerMessages.BRK_LISTENING(transport, port);
 
         List<Object> log = performLog();
 
@@ -52,12 +55,12 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testBrokerShuttingDown()
     {
         String transport = "TCP";
         Integer port = 2765;
 
-        _logMessage = BrokerMessages.BRK_1003(transport, port);
+        _logMessage = BrokerMessages.BRK_SHUTTING_DOWN(transport, port);
 
         List<Object> log = performLog();
 
@@ -66,9 +69,9 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1003", expected);
     }
 
-    public void testMessage1004()
+    public void testBrokerReady()
     {
-        _logMessage = BrokerMessages.BRK_1004();
+        _logMessage = BrokerMessages.BRK_READY();
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
@@ -76,9 +79,9 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testBrokerStopped()
     {
-        _logMessage = BrokerMessages.BRK_1005();
+        _logMessage = BrokerMessages.BRK_STOPPED();
         List<Object> log = performLog();
 
         String[] expected = {"Stopped"};
@@ -86,11 +89,11 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testBrokerConfig()
     {
         String path = "/file/path/to/configuration.xml";
 
-        _logMessage = BrokerMessages.BRK_1006(path);
+        _logMessage = BrokerMessages.BRK_CONFIG(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using configuration :", path};
@@ -98,11 +101,11 @@ public class BrokerMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "BRK-1006", expected);
     }
 
-    public void testMessage1007()
+    public void testBrokerLogConfig()
     {
         String path = "/file/path/to/configuration.xml";
 
-        _logMessage = BrokerMessages.BRK_1007(path);
+        _logMessage = BrokerMessages.BRK_LOG_CONFIG(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using logging configuration :", path};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
index b4dd3da2e6..2d414e9e95 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
@@ -20,14 +20,16 @@
  */
 package org.apache.qpid.server.logging.messages;
 
-import java.text.MessageFormat;
 import java.util.List;
 
+/**
+ * Test CHN Log Messges 
+ */
 public class ChannelMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testChannelCreate()
     {
-        _logMessage = ChannelMessages.CHN_1001();
+        _logMessage = ChannelMessages.CHN_CREATE();
         List<Object> log = performLog();
 
         // We use the MessageFormat here as that is what the ChannelMessage
@@ -37,11 +39,11 @@ public class ChannelMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "CHN-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testChannelFlow()
     {
         String flow = "ON";
 
-        _logMessage = ChannelMessages.CHN_1002(flow);
+        _logMessage = ChannelMessages.CHN_FLOW(flow);
         List<Object> log = performLog();
 
         String[] expected = {"Flow", flow};
@@ -49,9 +51,9 @@ public class ChannelMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "CHN-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testChannelClose()
     {
-        _logMessage = ChannelMessages.CHN_1003();
+        _logMessage = ChannelMessages.CHN_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
index d234c88210..6003cafc95 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
@@ -22,14 +22,17 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test CON Log Messages
+ */
 public class ConnectionMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001_WithClientIDProtocolVersion()
+    public void testConnectionOpen_WithClientIDProtocolVersion()
     {
         String clientID = "client";
         String protocolVersion = "8-0";
 
-        _logMessage = ConnectionMessages.CON_1001(clientID, protocolVersion, true , true);
+        _logMessage = ConnectionMessages.CON_OPEN(clientID, protocolVersion, true , true);
         List<Object> log = performLog();
 
         String[] expected = {"Open :", "Client ID", clientID,
@@ -38,11 +41,11 @@ public class ConnectionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithClientIDNoProtocolVersion()
+    public void testConnectionOpen_WithClientIDNoProtocolVersion()
     {
         String clientID = "client";        
 
-        _logMessage = ConnectionMessages.CON_1001(clientID, null,true, false);
+        _logMessage = ConnectionMessages.CON_OPEN(clientID, null,true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Open :", "Client ID", clientID};
@@ -50,11 +53,11 @@ public class ConnectionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithNOClientIDProtocolVersion()
+    public void testConnectionOpen_WithNOClientIDProtocolVersion()
     {
         String protocolVersion = "8-0";
 
-        _logMessage = ConnectionMessages.CON_1001(null, protocolVersion, false , true);
+        _logMessage = ConnectionMessages.CON_OPEN(null, protocolVersion, false , true);
         List<Object> log = performLog();
 
         String[] expected = {"Open", ": Protocol Version :", protocolVersion};
@@ -62,9 +65,9 @@ public class ConnectionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithNoClientIDNoProtocolVersion()
+    public void testConnectionOpen_WithNoClientIDNoProtocolVersion()
     {
-        _logMessage = ConnectionMessages.CON_1001(null, null,false, false);
+        _logMessage = ConnectionMessages.CON_OPEN(null, null,false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Open"};
@@ -74,9 +77,9 @@ public class ConnectionMessagesTest extends AbstractTestMessages
 
 
 
-    public void testMessage1002()
+    public void testConnectionClose()
     {
-        _logMessage = ConnectionMessages.CON_1002();
+        _logMessage = ConnectionMessages.CON_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
index 831ede3e0c..072f671fec 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
@@ -25,9 +25,12 @@ import org.apache.qpid.server.registry.ApplicationRegistry;
 
 import java.util.List;
 
+/**
+ * Test EXH Log Messages
+ */
 public class ExchangeMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001_Transient()
+    public void testExchangeCreated_Transient()
     {
         // Get the Default Exchange on the Test Vhost for testing
         Exchange exchange = ApplicationRegistry.getInstance().
@@ -37,7 +40,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
         String type = exchange.getType().toString();
         String name = exchange.getName().toString();
 
-        _logMessage = ExchangeMessages.EXH_1001(type, name, false);
+        _logMessage = ExchangeMessages.EXH_CREATED(type, name, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Type:", type, "Name:", name};
@@ -45,7 +48,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "EXH-1001", expected);
     }
 
-    public void testMessage1001_Persistent()
+    public void testExchangeCreated_Persistent()
     {
         // Get the Default Exchange on the Test Vhost for testing
         Exchange exchange = ApplicationRegistry.getInstance().
@@ -55,7 +58,7 @@ public class ExchangeMessagesTest extends AbstractTestMessages
         String type = exchange.getType().toString();
         String name = exchange.getName().toString();
 
-        _logMessage = ExchangeMessages.EXH_1001(type, name, true);
+        _logMessage = ExchangeMessages.EXH_CREATED(type, name, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable", "Type:", type, "Name:", name};
@@ -64,9 +67,9 @@ public class ExchangeMessagesTest extends AbstractTestMessages
     }
 
 
-    public void testMessage1002()
+    public void testExchangeDeleted()
     {
-        _logMessage = ExchangeMessages.EXH_1002();
+        _logMessage = ExchangeMessages.EXH_DELETED();
         List<Object> log = performLog();
 
         String[] expected = {"Deleted"};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index e9b40c5dad..9b1ab2c14d 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
@@ -22,11 +22,14 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test MNG Log Messages
+ */
 public class ManagementConsoleMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testManagementStartup()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1001();
+        _logMessage = ManagementConsoleMessages.MNG_STARTUP();
         List<Object> log = performLog();
 
         String[] expected = {"Startup"};
@@ -34,12 +37,12 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testManagementListening()
     {
         String transport = "JMX";
         Integer port = 8889;
 
-        _logMessage = ManagementConsoleMessages.MNG_1002(transport, port);
+        _logMessage = ManagementConsoleMessages.MNG_LISTENING(transport, port);
         List<Object> log = performLog();
 
         String[] expected = {"Starting :", transport, ": Listening on port", String.valueOf(port)};
@@ -47,12 +50,12 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testManagementShuttingDown()
     {
         String transport = "JMX";
         Integer port = 8889;
 
-        _logMessage = ManagementConsoleMessages.MNG_1003(transport, port);
+        _logMessage = ManagementConsoleMessages.MNG_SHUTTING_DOWN(transport, port);
         List<Object> log = performLog();
 
         String[] expected = {"Shuting down :", transport, ": port", String.valueOf(port)};
@@ -60,9 +63,9 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1003", expected);
     }
 
-    public void testMessage1004()
+    public void testManagementReady()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1004();
+        _logMessage = ManagementConsoleMessages.MNG_READY();
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
@@ -70,9 +73,9 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testManagementStopped()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1005();
+        _logMessage = ManagementConsoleMessages.MNG_STOPPED();
         List<Object> log = performLog();
 
         String[] expected = {"Stopped"};
@@ -80,11 +83,11 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testManagementSSLKeyStore()
     {
         String path = "/path/to/the/keystore/files.jks";
 
-        _logMessage = ManagementConsoleMessages.MNG_1006(path);
+        _logMessage = ManagementConsoleMessages.MNG_SSL_KEYSTORE(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using SSL Keystore :", path};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
index e3280a4076..21041fc611 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
@@ -23,13 +23,16 @@ package org.apache.qpid.server.logging.messages;
 import java.text.MessageFormat;
 import java.util.List;
 
+/**
+ * Test MST Log Messages
+ */
 public class MessageStoreMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testMessageStoreCreated()
     {
         String name = "DerbyMessageStore";
 
-        _logMessage = MessageStoreMessages.MST_1001(name);
+        _logMessage = MessageStoreMessages.MST_CREATED(name);
         List<Object> log = performLog();
 
         String[] expected = {"Created :", name};
@@ -37,21 +40,21 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MST-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testMessageStoreStoreLocation()
     {
         String location = "/path/to/the/message/store.files";
 
-        _logMessage = ConfigStoreMessages.CFG_1002(location);
+        _logMessage = MessageStoreMessages.MST_STORE_LOCATION(location);
         List<Object> log = performLog();
 
         String[] expected = {"Store location :", location};
 
-        validateLogMessage(log, "CFG-1002", expected);
+        validateLogMessage(log, "MST-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testMessageStoreClosed()
     {
-        _logMessage = MessageStoreMessages.MST_1003();
+        _logMessage = MessageStoreMessages.MST_CLOSED();
         List<Object> log = performLog();
 
         String[] expected = {"Closed"};
@@ -59,21 +62,21 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MST-1003", expected);
     }
 
-  /*  public void testMessage1004()
+  public void testMessageStoreRecoveryStart()
     {
-        _logMessage = MessageStoreMessages.MST_1004(null,false);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_START();
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Start"};
 
         validateLogMessage(log, "MST-1004", expected);
     }
-
-    public void testMessage1004_withQueue()
+/*
+    public void testMessageStoreRecoveryStart_withQueue()
     {
         String queueName = "testQueue";
 
-        _logMessage = MessageStoreMessages.MST_1004(queueName, true);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_START(queueName, true);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Start :", queueName};
@@ -81,12 +84,12 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MST-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testMessageStoreRecovered()
     {
         String queueName = "testQueue";
         Integer messasgeCount = 2000;
 
-        _logMessage = MessageStoreMessages.MST_1005(messasgeCount, queueName);
+        _logMessage = MessageStoreMessages.MST_RECOVERED(messasgeCount, queueName);
         List<Object> log = performLog();
 
         // Here we use MessageFormat to ensure the messasgeCount of 2000 is
@@ -98,9 +101,9 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MST-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testMessageStoreRecoveryComplete()
     {
-        _logMessage = MessageStoreMessages.MST_1006(null,false);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_COMPLETE(null,false);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Complete"};
@@ -108,11 +111,11 @@ public class MessageStoreMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MST-1006", expected);
     }
 
-    public void testMessage1006_withQueue()
+    public void testMessageStoreRecoveryComplete_withQueue()
     {
         String queueName = "testQueue";
 
-        _logMessage = MessageStoreMessages.MST_1006(queueName, true);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_COMPLETE(queueName, true);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Complete :", queueName};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
index c5d544ba84..417ae31d13 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
@@ -22,14 +22,17 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test QUE Log Messages
+ */
 public class QueueMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001ALL()
+    public void testQueueCreatedALL()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -39,11 +42,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDelete()
+    public void testQueueCreatedOwnerAutoDelete()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete"};
@@ -51,12 +54,12 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerPriority()
+    public void testQueueCreatedOwnerPriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, false, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, false, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "Priority:",
@@ -65,12 +68,12 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeletePriority()
+    public void testQueueCreatedOwnerAutoDeletePriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -80,11 +83,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteTransient()
+    public void testQueueCreatedOwnerAutoDeleteTransient()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, true, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -93,12 +96,12 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteTransientPriority()
+    public void testQueueCreatedOwnerAutoDeleteTransientPriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -108,11 +111,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteDurable()
+    public void testQueueCreatedOwnerAutoDeleteDurable()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, true, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, true, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -121,12 +124,12 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteDurablePriority()
+    public void testQueueCreatedOwnerAutoDeleteDurablePriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -136,9 +139,9 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDelete()
+    public void testQueueCreatedAutoDelete()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete"};
@@ -146,11 +149,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001Priority()
+    public void testQueueCreatedPriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, false, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, false, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Priority:",
@@ -159,11 +162,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeletePriority()
+    public void testQueueCreatedAutoDeletePriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -173,9 +176,9 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteTransient()
+    public void testQueueCreatedAutoDeleteTransient()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, true, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -184,11 +187,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteTransientPriority()
+    public void testQueueCreatedAutoDeleteTransientPriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -198,9 +201,9 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteDurable()
+    public void testQueueCreatedAutoDeleteDurable()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, true, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, true, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -209,11 +212,11 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteDurablePriority()
+    public void testQueueCreatedAutoDeleteDurablePriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, true, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, true, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -223,9 +226,9 @@ public class QueueMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testQueueDeleted()
     {
-        _logMessage = QueueMessages.QUE_1002();
+        _logMessage = QueueMessages.QUE_DELETED();
         List<Object> log = performLog();
 
         String[] expected = {"Deleted"};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
index 7752b873b6..b22f2e0b85 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
@@ -22,13 +22,16 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test SUB Log Messages
+ */
 public class SubscriptionMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001ALL()
+    public void testSubscriptionCreateALL()
     {
         String arguments = "arguments";
 
-        _logMessage = SubscriptionMessages.SUB_1001(arguments, true, true);
+        _logMessage = SubscriptionMessages.SUB_CREATE(arguments, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable", "Arguments :", arguments};
@@ -36,9 +39,9 @@ public class SubscriptionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "SUB-1001", expected);
     }
 
-    public void testMessage1001Durable()
+    public void testSubscriptionCreateDurable()
     {
-        _logMessage = SubscriptionMessages.SUB_1001(null, true, false);
+        _logMessage = SubscriptionMessages.SUB_CREATE(null, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable"};
@@ -46,11 +49,11 @@ public class SubscriptionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "SUB-1001", expected);
     }
 
-    public void testMessage1001Arguments()
+    public void testSubscriptionCreateArguments()
     {
         String arguments = "arguments";
 
-        _logMessage = SubscriptionMessages.SUB_1001(arguments, false, true);
+        _logMessage = SubscriptionMessages.SUB_CREATE(arguments, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :","Arguments :", arguments};
@@ -59,9 +62,9 @@ public class SubscriptionMessagesTest extends AbstractTestMessages
     }
 
 
-    public void testMessage1002()
+    public void testSubscriptionClose()
     {
-        _logMessage = SubscriptionMessages.SUB_1002();
+        _logMessage = SubscriptionMessages.SUB_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};
@@ -69,11 +72,11 @@ public class SubscriptionMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "SUB-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testSubscriptionState()
     {
         String state = "ACTIVE";
 
-        _logMessage = SubscriptionMessages.SUB_1003(state);
+        _logMessage = SubscriptionMessages.SUB_STATE(state);
         List<Object> log = performLog();
 
         String[] expected = {"State :", state};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
index 2158676115..06a8acac29 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
@@ -22,12 +22,15 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+/**
+ * Test VHT Log Messages
+ */
 public class VirtualHostMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testVirtualhostCreated()
     {
         String name = "test";
-        _logMessage = VirtualHostMessages.VHT_1001(name);
+        _logMessage = VirtualHostMessages.VHT_CREATED(name);
         List<Object> log = performLog();
 
         String[] expected = {"Created :", name};
@@ -35,9 +38,9 @@ public class VirtualHostMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "VHT-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testSubscriptionClosed()
     {
-        _logMessage = VirtualHostMessages.VHT_1002();
+        _logMessage = VirtualHostMessages.VHT_CLOSED();
         List<Object> log = performLog();
 
         String[] expected = {"Closed"};
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index 68f3fed1f9..905d63ea09 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -42,6 +42,17 @@ import org.apache.qpid.server.protocol.AMQProtocolSession;
 
 import java.util.List;
 
+/**
+ * Abstract Test for LogSubject testing
+ * Includes common validation code and two common tests.
+ *
+ * Each test class sets up the LogSubject and contains details of how to
+ * validate this class then performs a log statement with logging enabled and
+ * logging disabled.
+ *
+ * The resulting log file is then validated. 
+ *
+ */
 public abstract class AbstractTestLogSubject extends TestCase
 {
     protected Configuration _config = new PropertiesConfiguration();
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index 845d02267f..6319238841 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
@@ -27,6 +27,9 @@ import org.apache.qpid.server.queue.MockAMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+/**
+ * Validate BindingLogSubjects are logged as expected
+ */
 public class BindingLogSubjectTest extends AbstractTestLogSubject
 {
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index 75f31d53d1..41760e1b05 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
@@ -22,6 +22,9 @@ package org.apache.qpid.server.logging.subjects;
 
 import org.apache.qpid.server.AMQChannel;
 
+/**
+ * Validate ChannelLogSubjects are logged as expected
+ */
 public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
 {
     private final int _channelID = 1;
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index 0eb9901757..92234e9241 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.logging.subjects;
 
+/**
+ * Validate ConnectionLogSubjects are logged as expected
+ */
 public class ConnectionLogSubjectTest extends AbstractTestLogSubject
 {
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index 5bf00cc92f..7e16516fc6 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
@@ -24,6 +24,10 @@ import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+
+/**
+ * Validate ExchangeLogSubjects are logged as expected
+ */
 public class ExchangeLogSubjectTest extends AbstractTestLogSubject
 {
     Exchange _exchange;
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
index 53edf98d79..9c868ea651 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
@@ -23,6 +23,9 @@ package org.apache.qpid.server.logging.subjects;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 
+/**
+ * Validate MessageStoreLogSubjects are logged as expected
+ */
 public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
 {
     VirtualHost _testVhost;
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
index 7ef1f8d903..d46e1ee11b 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
@@ -25,6 +25,9 @@ import org.apache.qpid.server.queue.MockAMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+/**
+ * Validate QueueLogSubjects are logged as expected
+ */
 public class QueueLogSubjectTest extends AbstractTestLogSubject
 {
 
@@ -46,14 +49,13 @@ public class QueueLogSubjectTest extends AbstractTestLogSubject
 
     /**
      * Validate that the logged Subject  message is as expected:
-     * MESSAGE [Blank][vh(/test)/qu(BindingLogSubjectTest)] <Log Message>
+     * MESSAGE [Blank][vh(/test)/qu(QueueLogSubjectTest)] <Log Message>
      *
      * @param message the message whos format needs validation
      */
     @Override
     protected void validateLogStatement(String message)
     {
-        System.err.println(message);
         verifyVirtualHost(message, _testVhost);
         verifyQueue(message, _queue);
     }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
index fda951616e..e96dc47367 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.logging.subjects;
 
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.flow.LimitlessCreditManager;
 import org.apache.qpid.server.queue.AMQQueue;
@@ -32,14 +31,14 @@ import org.apache.qpid.server.subscription.SubscriptionFactory;
 import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
+/**
+ * Validate SubscriptionLogSubjects are logged as expected
+ */
 public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
 {
 
     AMQQueue _queue;
     VirtualHost _testVhost;
-    private boolean _acks;
-    private FieldTable _filters;
-    private boolean _noLocal;
     private int _channelID = 1;
     Subscription _subscription;
 
@@ -50,7 +49,7 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
         _testVhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().
                 getVirtualHost("test");
 
-        _queue = new MockAMQQueue("QueueLogSubjectTest");
+        _queue = new MockAMQQueue("SubscriptionLogSubjectTest");
         ((MockAMQQueue) _queue).setVirtualHost(_testVhost);
 
         AMQChannel channel = new AMQChannel(_session, _channelID, _session.getVirtualHost().getMessageStore());
@@ -60,7 +59,7 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
         SubscriptionFactory factory = new SubscriptionFactoryImpl();
 
         _subscription = factory.createSubscription(_channelID, _session, new AMQShortString("cTag"),
-                                                   _acks, _filters, _noLocal,
+                                                   false, null, false,
                                                    new LimitlessCreditManager());
 
         _subscription.setQueue(_queue, false);
@@ -70,7 +69,7 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
 
     /**
      * Validate that the logged Subject  message is as expected:
-     * MESSAGE [Blank][sub:0(qu(QueueLogSubjectTest))] <Log Message>
+     * MESSAGE [Blank][sub:0(vh(/test)/qu(SubscriptionLogSubjectTest))] <Log Message>
      *
      * @param message the message whos format needs validation
      */
@@ -84,9 +83,23 @@ public class SubscriptionLogSubjectTest extends AbstractTestLogSubject
         assertNotNull("Unable to locate subscription 'sub:" +
                       _subscription.getSubscriptionID() + "'");
 
+
+
+        // Pull out the qu(..) section from the subscription message
+        // Split it into three parts
+        // MESSAGE [Blank][sub:0(vh(/
+        //                           test)/
+        //                                 qu(SubscriptionLogSubjectTest))]
+        // Take the last bit and drop off the extra )]        
+        String[] parts = message.split("/");
+        assertEquals("Message part count wrong", 3, parts.length);
+        String subscription = parts[2].substring(0, parts[2].indexOf(")") + 1);
+
         // Adding the ')' is a bit ugly but SubscriptionLogSubject is the only
         // Subject that nests () and so the simple parser of checking for the
         // next ')' falls down.
-        verifyQueue(subscriptionSlice + ")", _queue);
+        verifyVirtualHost(subscriptionSlice+ ")", _queue.getVirtualHost());
+
+        verifyQueue(subscription, _queue);
     }
 }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
index 9e3c6f9bcb..3028ad0409 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.logging.subjects;
 
+/**
+ * Blank Subject for testing
+ */
 public class TestBlankSubject extends AbstractLogSubject
 {
     public TestBlankSubject()