QPID-1992 : Corrected duplication in ServerConfiguration for StatusUpdates and so renamed method getStatusUpdatesEnabled

Ensured tested in ServerConfiguration[File]Test and removed standalone test that replicated functionality.

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

2 files changed, 18 insertions, 73 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 a673a75fda..92f4926c83 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
@@ -223,6 +223,24 @@ public class ServerConfigurationTest extends TestCase
         assertEquals(23, serverConfig.getBufferWriteLimit());
     }
 
+
+    public void testGetStatusEnabled() throws ConfigurationException
+    {
+        // Check default
+        ServerConfiguration serverConfig = new ServerConfiguration(_config);
+        assertEquals(true, serverConfig.getStatusUpdatesEnabled());
+
+        // Check disabling we set
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "off");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+        // Check invalid values don't cause error but result in disabled
+        _config.setProperty(ServerConfiguration.STATUS_UPDATES, "Yes Please");
+        serverConfig = new ServerConfiguration(_config);
+        assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+    }
     public void testGetSynchedClocks() throws ConfigurationException
     {
         // Check default
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/StatusUpdateConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/StatusUpdateConfigurationTest.java
deleted file mode 100644
index 9a3c18bf99..0000000000
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/StatusUpdateConfigurationTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  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;
-
-import junit.framework.TestCase;
-import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-
-/**
- * Set of test to validate the effects of the changes made to the
- * ServerConfiguration to enable the enabling/disabling of status update
- * messages.
- *
- * The default is to on.
- */
-public class StatusUpdateConfigurationTest extends TestCase
-{
-
-    /**
-     * Validate that with no configuration the status updates will default to
-     * enabled.
-     * @throws org.apache.commons.configuration.ConfigurationException
-     * - if there was a problem in creating the configuratino
-     */
-    public void testEnabled() throws ConfigurationException
-    {
-
-        ServerConfiguration serverConfig = new ServerConfiguration(
-                new PropertiesConfiguration());
-
-        assertTrue("Status Updates not enabled as expected.",
-                   serverConfig.getStatusUpdates());
-    }
-
-
-    /**
-     * Validate that through the config it is possible to disable status updates
-     * @throws org.apache.commons.configuration.ConfigurationException
-     * - if there was a problem in creating the configuratino
-     */
-    public void testUpdateControls() throws ConfigurationException
-    {
-
-        Configuration config = new PropertiesConfiguration();
-        ServerConfiguration serverConfig = new ServerConfiguration(config);
-
-        config.setProperty("status-updates", "off");
-
-
-        assertFalse("Status Updates should not be enabled.",
-                   serverConfig.getStatusUpdates());
-    }
-}