QPID-2632 : Update to ensure multiple virtualhosts are actually added, required move to XMLConfiguration from PropertyConfiguration

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

1 files changed, 6 insertions, 5 deletions

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 7e33110b03..0370bc794c 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
@@ -22,6 +22,7 @@ package org.apache.qpid.server.util;
 
 import junit.framework.TestCase;
 import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.exchange.ExchangeDefaults;
@@ -69,12 +70,12 @@ public class InternalBrokerBaseCase extends TestCase
     {
         CurrentActor.set(new TestLogActor(new StartupRootMessageLogger()));
 
-        PropertiesConfiguration configuration = new PropertiesConfiguration();
-        configuration.setProperty("virtualhosts.virtualhost.name", "test");
-        configuration.setProperty("virtualhosts.virtualhost.test.store.class", TestableMemoryMessageStore.class.getName());
+        XMLConfiguration configuration = new XMLConfiguration();
+        configuration.addProperty("virtualhosts.virtualhost.name", "test");
+        configuration.addProperty("virtualhosts.virtualhost.test.store.class", TestableMemoryMessageStore.class.getName());
         
-        configuration.setProperty("virtualhosts.virtualhost.name", getName());
-        configuration.setProperty("virtualhosts.virtualhost."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
+        configuration.addProperty("virtualhosts.virtualhost(-1).name", getName());
+        configuration.addProperty("virtualhosts.virtualhost(-1)."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
 
         _configuration = new ServerConfiguration(configuration);