QPID-2581 : Update ConfigurationPlugin to provide a validateConfiguration() method simplifying the plugins

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

2 files changed, 8 insertions, 8 deletions

diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
index 049402d83e..00411842f0 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionConfigurationTest.java
@@ -138,7 +138,7 @@ public class SlowConsumerDetectionConfigurationTest extends TestCase
             assertEquals("Cause not correct",
                          ConfigurationException.class, cause.getClass());
             assertEquals("Incorrect message.",
-                         "Slow Consumer Detection Delay must be a Positive Long value.",
+                         "SlowConsumerDetectionConfiguration: 'delay' must be a Positive Long value.",
                          cause.getMessage());
         }
     }
@@ -170,7 +170,7 @@ public class SlowConsumerDetectionConfigurationTest extends TestCase
             assertEquals("Cause not correct",
                          ConfigurationException.class, cause.getClass());
             assertEquals("Incorrect message.",
-                         "Slow Consumer Detection Delay must be a Positive Long value.",
+                         "SlowConsumerDetectionConfiguration: 'delay' must be a Positive Long value.",
                          cause.getMessage());
         }
     }
@@ -194,7 +194,7 @@ public class SlowConsumerDetectionConfigurationTest extends TestCase
         }
         catch (ConfigurationException e)
         {
-            assertEquals("Incorrect message.", "Unable to configure Slow Consumer Detection invalid delay:null", e.getMessage());
+            assertEquals("Incorrect message.", "SlowConsumerDetectionConfiguration: unable to configure invalid delay:null", e.getMessage());
         }
     }
 
@@ -205,7 +205,7 @@ public class SlowConsumerDetectionConfigurationTest extends TestCase
 
         String TIMEUNIT = "foo";
         XMLConfiguration xmlconfig = new XMLConfiguration();
-
+                                                                                
         xmlconfig.addProperty("delay", "10");
         xmlconfig.addProperty("timeunit", TIMEUNIT);
 
diff --git a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
index 8abd6c1408..b149313dfd 100644
--- a/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
+++ b/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetectionQueueConfigurationTest.java
@@ -69,7 +69,7 @@ public class SlowConsumerDetectionQueueConfigurationTest extends TestCase
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified at:''. Known Policies:[]",
+            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
                          e.getMessage());
         }
     }
@@ -125,7 +125,7 @@ public class SlowConsumerDetectionQueueConfigurationTest extends TestCase
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified at:''. Known Policies:[]",
+            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
                          e.getMessage());
         }
     }
@@ -154,7 +154,7 @@ public class SlowConsumerDetectionQueueConfigurationTest extends TestCase
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified at:''. Known Policies:[]",
+            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
                          e.getMessage());
         }
     }
@@ -183,7 +183,7 @@ public class SlowConsumerDetectionQueueConfigurationTest extends TestCase
         }
         catch (ConfigurationException e)
         {
-            assertEquals("No Slow Consumer Policy specified at:''. Known Policies:[]",
+            assertEquals("No Slow Consumer Policy specified. Known Policies:[]",
                          e.getMessage());
         }
     }