QPID-2001 : Updated Broker Logging Unit tests to ensure that they enable logging before running.

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

8 files changed, 17 insertions, 2 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
index 08b95f9d77..c5f291a0cb 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
@@ -233,7 +233,8 @@ public class ServerConfigurationTest extends TestCase
     {
         // Check default
         ServerConfiguration serverConfig = new ServerConfiguration(_config);
-        assertEquals(true, serverConfig.getStatusUpdatesEnabled());
+        assertEquals(ServerConfiguration.DEFAULT_STATUS_UPDATES.equalsIgnoreCase("on"),
+                     serverConfig.getStatusUpdatesEnabled());
 
         // Check disabling we set
         _config.setProperty(ServerConfiguration.STATUS_UPDATES, "off");
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 fb3c96a5d3..0fa126dedb 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
@@ -66,6 +66,8 @@ public class AMQPChannelActorTest extends TestCase
         Configuration config = new PropertiesConfiguration();
         ServerConfiguration serverConfig = new ServerConfiguration(config);
 
+        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");        
+
         setUpWithConfig(serverConfig);
     }
 
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 0700fd3c1a..1b25844a14 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
@@ -63,6 +63,8 @@ public class AMQPConnectionActorTest extends TestCase
         Configuration config = new PropertiesConfiguration();
         ServerConfiguration serverConfig = new ServerConfiguration(config);
 
+        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+
         setUpWithConfig(serverConfig);
     }
 
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 340c0ae837..9fc1d2a18f 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
@@ -57,6 +57,8 @@ public class ManagementActorTest extends TestCase
         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);
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 5d2fe26707..727b83c60b 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
@@ -46,6 +46,8 @@ public class QueueActorTest extends TestCase
         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);
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 4e357ec52e..6b09087eef 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
@@ -59,6 +59,8 @@ public class SubscriptionActorTest extends TestCase
         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);
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 2656a8b5cb..b9b222755d 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
@@ -53,6 +53,8 @@ public abstract class AbstractTestMessages extends TestCase
 
         ServerConfiguration serverConfig = new ServerConfiguration(_config);
 
+        serverConfig.getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+
         _logger = new UnitTestMessageLogger();
         RootMessageLogger rootLogger =
                 new RootMessageLoggerImpl(serverConfig, _logger);
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 74b448b229..68f3fed1f9 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
@@ -53,6 +53,8 @@ public abstract class AbstractTestLogSubject extends TestCase
     {
         super.setUp();
 
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "ON");
+
         VirtualHost virtualHost = ApplicationRegistry.getInstance().
                 getVirtualHostRegistry().getVirtualHosts().iterator().next();
 
@@ -276,7 +278,7 @@ public abstract class AbstractTestLogSubject extends TestCase
      */
     public void testDisabled() throws ConfigurationException
     {
-        _config.addProperty("status-updates", "OFF");
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "OFF");
 
         List<Object> logs = performLog();