QPID-5851: [Java Broker] Introduce new test profiles for JSON configuration store and persistent message store

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

4 files changed, 21 insertions, 9 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
index 0f67121212..7605c8a024 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java
@@ -76,12 +76,12 @@ public class SplitStoreTest extends QpidBrokerTestCase
 
     public void testJsonConfigurationStoreWithPersistentMessageStore() throws Exception
     {
-        doTest(JsonFileConfigStore.TYPE, getTestProfileMessageStoreType());
+        doTest(JsonFileConfigStore.TYPE, getTestProfileVirtualHostNodeType());
     }
 
     public void testSeparateConfigurationAndMessageStoresOfTheSameType() throws Exception
     {
-        doTest(getTestProfileVirtualHostNodeType(), getTestProfileMessageStoreType());
+        doTest(getTestProfileVirtualHostNodeType(), getTestProfileVirtualHostNodeType());
     }
 
     private void configureAndStartBroker(String virtualHostNodeType, String virtualHostType) throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
index 430fadc2f1..278de6cf41 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.File;
+import java.io.IOException;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -71,10 +72,13 @@ import org.apache.qpid.server.queue.StandardQueueImpl;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.BrokerTestHelper;
+import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
+import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
 import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.util.FileUtils;
+import org.codehaus.jackson.map.ObjectMapper;
 
 /**
  *
@@ -136,12 +140,21 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
         nodeAttributes.put(ConfiguredObject.TYPE, getTestProfileVirtualHostNodeType());
         nodeAttributes.put(FileBasedVirtualHostNode.STORE_PATH, _storePath);
         nodeAttributes.put(VirtualHostNode.NAME, nodeName);
+
         _node = factory.create(VirtualHostNode.class, nodeAttributes, broker);
         _node.start();
 
         final Map<String,Object> virtualHostAttributes = new HashMap<>();
         virtualHostAttributes.put(VirtualHost.NAME, hostName);
-
+        virtualHostAttributes.put(VirtualHost.NAME, hostName);
+        String bluePrint = getTestProfileVirtualHostNodeBlueprint();
+        if (bluePrint == null)
+        {
+            bluePrint = "{type=\"" + TestMemoryVirtualHost.VIRTUAL_HOST_TYPE + "\"}";
+        }
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<String, Object> attrs =  objectMapper.readValue(bluePrint, Map.class);
+        virtualHostAttributes.putAll(attrs);
         _node.createChild(VirtualHost.class, virtualHostAttributes, _node);
 
         _virtualHost = (VirtualHostImpl<?,?,?>)_node.getVirtualHost();
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index 54dca95e9b..e287c9d5c1 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import javax.jms.Session;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 
@@ -42,7 +43,6 @@ import org.apache.qpid.server.queue.LastValueQueue;
 import org.apache.qpid.server.queue.PriorityQueue;
 import org.apache.qpid.server.queue.SortedQueue;
 import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
-import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHost;
 import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
 import org.apache.qpid.util.FileUtils;
 
@@ -540,7 +540,7 @@ public class VirtualHostRestTest extends QpidRestTestCase
 
         Map<String, Object> virtualhostData = new HashMap<>();
         virtualhostData.put(VirtualHost.NAME, virtualHostName);
-        virtualhostData.put(VirtualHost.TYPE, ProvidedStoreVirtualHost.VIRTUAL_HOST_TYPE);
+        virtualhostData.put(VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
 
         getRestTestHelper().submitRequest("virtualhost/" + virtualHostName + "/" + virtualHostName,
                                           "PUT",
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 9b6abb1447..92d163f05a 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -70,7 +70,6 @@ import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MemoryConfigurationStore;
-import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHost;
 import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
 import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
 import org.apache.qpid.url.URLSyntaxException;
@@ -561,8 +560,8 @@ public class QpidBrokerTestCase extends QpidTestCase
                 setSystemProperty("test.port.ssl");
                 setSystemProperty("test.port.alt");
                 setSystemProperty("test.port.alt.ssl");
-                setSystemProperty("messagestore.type");
-
+                setSystemProperty("virtualhostnode.type");
+                setSystemProperty("virtualhostnode.context.blueprint");
 
                 // Add all the specified system properties to QPID_OPTS
                 if (!_propertiesSetForBroker.isEmpty())
@@ -872,7 +871,7 @@ public class QpidBrokerTestCase extends QpidTestCase
         {
             attributes.put(FileBasedVirtualHostNode.STORE_PATH, storeDir);
         }
-        final String blueprint = String.format("{ \"type\" : \"%s\"  } }", ProvidedStoreVirtualHost.VIRTUAL_HOST_TYPE);
+        final String blueprint = getTestProfileVirtualHostNodeBlueprint();
         attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
                                                                           blueprint));