QPID-2583 : Update tests to correctly throw ConfigurationException where requried and to correctly configure configuration

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

2 files changed, 6 insertions, 0 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index f02b1f435f..1314a6e9d3 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -518,6 +518,11 @@ public class MockAMQQueue implements AMQQueue
 
     }
 
+    public QueueConfiguration getConfiguration()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     public PrincipalHolder getPrincipalHolder()
     {
         return _principalHolder;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 88178041ca..e3c43779f6 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -59,6 +59,7 @@ public class InternalBrokerBaseCase extends TestCase
     {
         super.setUp();
         PropertiesConfiguration configuration = new PropertiesConfiguration();
+        configuration.setProperty("virtualhosts.virtualhost.name", "test");
         configuration.setProperty("virtualhosts.virtualhost.test.store.class", TestableMemoryMessageStore.class.getName());
         _registry = new TestApplicationRegistry(new ServerConfiguration(configuration));
         ApplicationRegistry.initialise(_registry);