QPID-2632 : Updated actor test for IBBC.

Base classes now extends IBBC rather than TestCase.
The rest of the tests were updated to make use of the configure method rather than their own setUpWithConfig().
The test do not directly require an ApplicationRegistry and were using it to assist in the creation of the logger parmeters.
CurrentActor test was also updated to stop the broker before testing to ensure that any Actors set for the broker test run are removed so that the CurrentActor.set/remove logic can be tested.

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

7 files changed, 39 insertions, 71 deletions

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 ad8b25a4ac..7d1f21e082 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
@@ -47,11 +47,9 @@ public class AMQPChannelActorTest extends BaseConnectionActorTestCase
     AMQChannel _channel;
 
     @Override
-    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    public void configure()
     {
-        super.setUpWithConfig(serverConfig);
-
-        _channel = new AMQChannel(_session, 1, _session.getVirtualHost().getMessageStore());
+        super.configure();
 
         _amqpActor = new AMQPChannelActor(_channel, _rootLogger);
     }
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 dd5632f2b0..8170315bc7 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
@@ -31,43 +31,34 @@ 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 TestCase
+public class BaseActorTestCase extends InternalBrokerBaseCase
 {
     protected LogActor _amqpActor;
     protected UnitTestMessageLogger _rawLogger;
     protected RootMessageLogger _rootLogger;
 
-    public void setUp() throws Exception
+    @Override
+    public void configure()
     {
-        super.setUp();
-        //Highlight that this test will cause a new AR to be created
-        ApplicationRegistry.getInstance();
+        _configuration.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
 
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+        _rawLogger = new UnitTestMessageLogger();
 
-        setUpWithConfig(serverConfig);
+        _rootLogger =
+                new RootMessageLoggerImpl(_configuration, _rawLogger);
     }
 
     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
index 6e8ecc1313..d359943d6f 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
@@ -20,29 +20,14 @@
  */
 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
+    public void configure()
     {
-        super.setUpWithConfig(serverConfig);
-
-        VirtualHost virtualHost = ApplicationRegistry.getInstance().
-                getVirtualHostRegistry().getVirtualHosts().iterator().next();
+        super.configure();
 
-        // 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 0d7d0c3dba..ae2ea5fb69 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,10 +20,12 @@
  */
 package org.apache.qpid.server.logging.actors;
 
+import org.apache.commons.configuration.ConfigurationException;
 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.logging.NullRootMessageLogger;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 
 /**
@@ -68,15 +70,18 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
      * in there being no actors set.
      *
      * @throws AMQException
+     * @throws org.apache.commons.configuration.ConfigurationException
      */
-    public void testLIFO() throws AMQException
+    public void testLIFO() throws AMQException, ConfigurationException
     {
-        // Create a new actor using retrieving the rootMessageLogger from
-        // the default ApplicationRegistry.
-        //fixme reminder that we need a better approach for broker testing.
+        // This test only needs the local objects created, _session etc.
+        // So stopping the broker and making them useless will not affect the
+        // test, but the extra actors the test broker adds will so by stopping
+        // we remove the session actor and so all is good.
+        stopBroker();
+        
         AMQPConnectionActor connectionActor = new AMQPConnectionActor(_session,
-                                                                      ApplicationRegistry.getInstance().
-                                                                              getRootMessageLogger());
+                                                                      new NullRootMessageLogger());
 
         /*
          * Push the actor on to the stack:
@@ -118,8 +123,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
         AMQChannel channel = new AMQChannel(_session, 1, _session.getVirtualHost().getMessageStore());
 
         AMQPChannelActor channelActor = new AMQPChannelActor(channel,
-                                                             ApplicationRegistry.getInstance().
-                                                                     getRootMessageLogger());
+                                                             new NullRootMessageLogger());
 
         CurrentActor.set(channelActor);
 
@@ -178,7 +182,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
      *
      * 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
+     * If the ThreadLocal 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
      *
@@ -250,14 +254,14 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
             // Create a new actor using retrieving the rootMessageLogger from
             // the default ApplicationRegistry.
             //fixme reminder that we need a better approach for broker testing.
-            AMQPConnectionActor actor = new AMQPConnectionActor(_session,
-                                                                ApplicationRegistry.getInstance().
-                                                                        getRootMessageLogger());
-
-            CurrentActor.set(actor);
-
             try
             {
+
+                AMQPConnectionActor actor = new AMQPConnectionActor(_session,
+                                                                    new NullRootMessageLogger());
+
+                CurrentActor.set(actor);
+
                 //Use the Actor to send a simple message
                 CurrentActor.get().message(new LogSubject()
                 {
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 caee84da09..3f9dc59e67 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
-    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    public void configure()
     {
-        super.setUpWithConfig(serverConfig);
+        super.configure();
         _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 bf8fd86f85..5001029931 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,15 +32,10 @@ public class QueueActorTest extends BaseConnectionActorTestCase
 {
 
     @Override
-    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    public void configure()
     {
-        super.setUpWithConfig(serverConfig);
-
-        MockAMQQueue queue = new MockAMQQueue(getName());
-
-        queue.setVirtualHost(_session.getVirtualHost());
-
-        _amqpActor = new QueueActor(queue, _rootLogger);
+        super.configure();
+        _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 c86ffd4872..6a40d96e2e 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,18 +42,13 @@ public class SubscriptionActorTest extends BaseConnectionActorTestCase
 {
 
     @Override
-    protected void setUpWithConfig(ServerConfiguration serverConfig) throws AMQException
+    public void configure()
     {
-        super.setUpWithConfig(serverConfig);
-
+        super.configure();
 
         MockSubscription mockSubscription = new MockSubscription();
 
-        MockAMQQueue queue = new MockAMQQueue(getName());
-
-        queue.setVirtualHost(_session.getVirtualHost());
-
-        mockSubscription.setQueue(queue,false);
+        mockSubscription.setQueue(_queue, false);
 
         _amqpActor = new SubscriptionActor(_rootLogger, mockSubscription);
     }