QPID-1447 : Complete SCDPolicyConfiguration Testing

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

5 files changed, 97 insertions, 21 deletions

diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
index 3c87ca08b2..90bd3206e1 100644
--- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
+++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionConfiguration.java
@@ -56,7 +56,7 @@ public class SlowConsumerDetectionConfiguration extends ConfigurationPlugin
 
     public long getDelay()
     {
-        return _configuration.getLong("delay", 10);
+        return getLongValue("delay", 10);
     }
 
     public TimeUnit getTimeUnit()
diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
index 482168930b..b6a4ab3cbf 100644
--- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
+++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionPolicyConfiguration.java
@@ -56,7 +56,7 @@ public class SlowConsumerDetectionPolicyConfiguration extends ConfigurationPlugi
 
     public String getPolicyName()
     {
-        return _configuration.getString("name");
+        return getStringValue("name");
     }
 
     public void setConfiguration(String path, Configuration configuration) throws ConfigurationException
diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
index ce3393ae70..5f1e0c00b9 100644
--- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
+++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/configuration/plugin/SlowConsumerDetectionQueueConfiguration.java
@@ -60,19 +60,19 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
                             "messageCount"};
     }
 
-    public int getMessageAge()
+    public long getMessageAge()
     {
-        return (int) getConfigurationValue("messageAge");
+        return getLongValue("messageAge");
     }
 
     public long getDepth()
     {
-        return getConfigurationValue("depth");
+        return getLongValue("depth");
     }
 
     public long getMessageCount()
     {
-        return getConfigurationValue("messageCount");
+        return getLongValue("messageCount");
     }
 
     public SlowConsumerPolicyPlugin getPolicy()
@@ -85,7 +85,16 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
     {
         super.setConfiguration(path, configuration);
 
-        SlowConsumerDetectionPolicyConfiguration policyConfig = getConfiguration(SlowConsumerDetectionPolicyConfiguration.class);
+        if (!containsPositiveLong("messageAge") &&
+            !containsPositiveLong("depth") &&
+            !containsPositiveLong("messageCount"))
+        {
+            throw new ConfigurationException("At least one configuration property" +
+                                             "('messageAge','depth' or 'messageCount') must be specified.");             
+        }
+
+        SlowConsumerDetectionPolicyConfiguration policyConfig =
+                getConfiguration(SlowConsumerDetectionPolicyConfiguration.class);
 
         PluginManager pluginManager = ApplicationRegistry.getInstance().getPluginManager();
         Map<String, SlowConsumerPolicyPluginFactory> factories =
@@ -93,7 +102,8 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
 
         if (policyConfig == null)
         {
-            throw new ConfigurationException("No Slow Consumer Policy specified at:" + path + ". Known Policies:" + factories.keySet());
+            throw new ConfigurationException("No Slow Consumer Policy specified at:'" +
+                                             path + "'. Known Policies:" + factories.keySet());
         }
 
         if (_logger.isDebugEnabled())
@@ -125,16 +135,4 @@ public class SlowConsumerDetectionQueueConfiguration extends ConfigurationPlugin
         _policyPlugin = pluginFactory.newInstance(policyConfig);
     }
 
-    private long getConfigurationValue(String property)
-    {
-        // The _configuration we are given is a munged configurated
-        // so the queue will already have queue-queues munging
-
-        // we then need to ensure that the TopicsConfiguration
-        // and TopicConfiguration classes correctly munge their configuration:
-        // queue-queues -> topic-topics
-
-        return _configuration.getLong(property, 0);
-    }
-
 }
diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
index 30c1b05b4e..27c214097a 100644
--- a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
+++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyConfiguration.java
@@ -57,7 +57,7 @@ public class TopicDeletePolicyConfiguration extends ConfigurationPlugin
     public boolean deletePersistent()
     {
         // If we don't have configuration then we don't deletePersistent Queues 
-        return (_configuration != null && _configuration.containsKey("delete-persistent"));
+        return (hasConfiguration() && contains("delete-persistent"));
     }
 
 }
diff --git a/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
new file mode 100644
index 0000000000..9e0fd7bb2f
--- /dev/null
+++ b/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionPolicyConfigurationTest.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * 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.virtualhost.plugin;
+
+import junit.framework.TestCase;
+import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.configuration.plugin.SlowConsumerDetectionPolicyConfiguration;
+
+public class SlowConsumerDetectionPolicyConfigurationTest extends TestCase
+{
+
+    public void testConfigLoadingValidConfig()
+    {
+        SlowConsumerDetectionPolicyConfiguration config = new SlowConsumerDetectionPolicyConfiguration();
+
+        XMLConfiguration xmlconfig = new XMLConfiguration();
+
+        xmlconfig.addProperty("name", "TestPolicy");
+
+        // Create a CompositeConfiguration as this is what the broker uses
+        CompositeConfiguration composite = new CompositeConfiguration();
+        composite.addConfiguration(xmlconfig);
+
+        try
+        {
+            config.setConfiguration("", composite);
+        }
+        catch (ConfigurationException e)
+        {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+    }
+
+    public void testConfigLoadingInValidConfig()
+    {
+        SlowConsumerDetectionPolicyConfiguration config = new SlowConsumerDetectionPolicyConfiguration();
+
+        XMLConfiguration xmlconfig = new XMLConfiguration();
+
+
+        // Create a CompositeConfiguration as this is what the broker uses
+        CompositeConfiguration composite = new CompositeConfiguration();
+        composite.addConfiguration(xmlconfig);
+
+        try
+        {
+            config.setConfiguration("", composite);
+            fail("Config is invalid so won't validate.");            
+        }
+        catch (ConfigurationException e)
+        {
+            e.printStackTrace();
+            assertEquals("Exception message not as expected.", "No Slow consumer policy defined.", e.getMessage());
+        }
+    }
+
+}