You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/04/21 16:28:32 UTC
svn commit: r1588886 [6/6] - in /qpid/trunk/qpid/java:
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/src/main/java/org/apache/qpid/server/store/b...
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java Mon Apr 21 14:28:29 2014
@@ -48,25 +48,9 @@ public class BindingRestTest extends Qpi
}
}
- public void testGetVirtualHostBindings() throws Exception
- {
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test");
- assertNotNull("Bindings cannot be null", bindings);
- assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size());
- for (String queueName : RestTestHelper.EXPECTED_QUEUES)
- {
- Map<String, Object> searchAttributes = new HashMap<String, Object>();
- searchAttributes.put(Binding.NAME, queueName);
- searchAttributes.put(Binding.EXCHANGE, "amq.direct");
-
- Map<String, Object> binding = getRestTestHelper().find(searchAttributes, bindings);
- Asserts.assertBinding(queueName, "amq.direct", binding);
- }
- }
-
public void testGetVirtualHostExchangeBindings() throws Exception
{
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct");
+ List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct");
assertNotNull("Bindings cannot be null", bindings);
assertEquals("Unexpected number of bindings", RestTestHelper.EXPECTED_QUEUES.length, bindings.size());
for (String queueName : RestTestHelper.EXPECTED_QUEUES)
@@ -78,7 +62,7 @@ public class BindingRestTest extends Qpi
public void testGetVirtualHostExchangeQueueBindings() throws Exception
{
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/queue");
+ List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/queue");
assertNotNull("Bindings cannot be null", bindings);
assertEquals("Unexpected number of bindings", 1, bindings.size());
Asserts.assertBinding("queue", "amq.direct", bindings.get(0));
@@ -87,25 +71,24 @@ public class BindingRestTest extends Qpi
public void testDeleteBinding() throws Exception
{
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/queue/queue");
+ String bindingUrl = "/rest/binding/test/test/amq.direct/queue/queue";
+ List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList(bindingUrl);
assertEquals("Unexpected number of bindings", 1, bindings.size());
Asserts.assertBinding("queue", "amq.direct", bindings.get(0));
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/binding/test/amq.direct/queue/queue", "DELETE");
- connection.connect();
- assertEquals("Unexpected response code", 200, connection.getResponseCode());
+ int responseCode = getRestTestHelper().submitRequest(bindingUrl, "DELETE", null);
+ assertEquals("Unexpected response code", 200, responseCode);
- bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/queue/queue");
+ bindings = getRestTestHelper().getJsonAsList(bindingUrl);
assertEquals("Binding should be deleted", 0, bindings.size());
}
public void testDeleteBindingById() throws Exception
{
- Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("/rest/binding/test/amq.direct/queue");
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/binding/test/amq.direct?id=" + binding.get(Binding.ID), "DELETE");
- connection.connect();
- assertEquals("Unexpected response code", 200, connection.getResponseCode());
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/queue");
+ Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("/rest/binding/test/test/amq.direct/queue");
+ int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/test/amq.direct?id=" + binding.get(Binding.ID), "DELETE", null);
+ assertEquals("Unexpected response code", 200, responseCode);
+ List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/queue");
assertEquals("Binding should be deleted", 0, bindings.size());
}
@@ -117,14 +100,12 @@ public class BindingRestTest extends Qpi
bindingData.put(Binding.QUEUE, "queue");
bindingData.put(Binding.EXCHANGE, "amq.direct");
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/binding/test/amq.direct/queue/" + bindingName, "PUT");
- connection.connect();
- getRestTestHelper().writeJsonRequest(connection, bindingData);
- int responseCode = connection.getResponseCode();
- connection.disconnect();
+ String bindingUrl = "/rest/binding/test/test/amq.direct/queue/" + bindingName;
+
+ int responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", bindingData);
assertEquals("Unexpected response code", 201, responseCode);
- Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("/rest/binding/test/amq.direct/queue/" + bindingName);
+ Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList(bindingUrl);
Asserts.assertBinding(bindingName, "queue", "amq.direct", binding);
}
@@ -136,16 +117,16 @@ public class BindingRestTest extends Qpi
attributes.put(Binding.QUEUE, "queue");
attributes.put(Binding.EXCHANGE, "amq.direct");
- int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/amq.direct/queue/" + bindingName, "PUT", attributes);
+ String bindingUrl = "/rest/binding/test/test/amq.direct/queue/" + bindingName;
+ int responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", attributes);
assertEquals("Unexpected response code", 201, responseCode);
- Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList("/rest/binding/test/amq.direct/queue/" + bindingName);
-
+ Map<String, Object> binding = getRestTestHelper().getJsonAsSingletonList(bindingUrl);
Asserts.assertBinding(bindingName, "queue", "amq.direct", binding);
- attributes.put(Binding.ARGUMENTS, null);
+ attributes.put(Binding.ARGUMENTS, "blah");
- responseCode = getRestTestHelper().submitRequest("/rest/binding/test/amq.direct/queue/" + bindingName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(bindingUrl, "PUT", attributes);
assertEquals("Update should be unsupported", 409, responseCode);
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Mon Apr 21 14:28:29 2014
@@ -40,6 +40,7 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.plugin.MessageStoreFactory;
import org.apache.qpid.test.client.UnroutableMessageTestExceptionListener;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -49,7 +50,7 @@ public class BrokerRestTest extends Qpid
{
private static final String BROKER_AUTHENTICATIONPROVIDERS_ATTRIBUTE = "authenticationproviders";
private static final String BROKER_PORTS_ATTRIBUTE = "ports";
- private static final String BROKER_VIRTUALHOSTS_ATTRIBUTE = "virtualhosts";
+ private static final String BROKER_VIRTUALHOST_NODES_ATTRIBUTE = "virtualhostnodes";
private static final String BROKER_STATISTICS_ATTRIBUTE = "statistics";
public void testGet() throws Exception
@@ -63,12 +64,14 @@ public class BrokerRestTest extends Qpid
Asserts.assertAttributesPresent(statistics, new String[]{ "bytesIn", "messagesOut", "bytesOut", "messagesIn" });
@SuppressWarnings("unchecked")
- List<Map<String, Object>> virtualhosts = (List<Map<String, Object>>) brokerDetails.get(BROKER_VIRTUALHOSTS_ATTRIBUTE);
- assertEquals("Unexpected number of virtual hosts", 3, virtualhosts.size());
+ List<Map<String, Object>> nodes = (List<Map<String, Object>>) brokerDetails.get(BROKER_VIRTUALHOST_NODES_ATTRIBUTE);
+ assertEquals("Unexpected number of virtual hosts", 3, nodes.size());
- Asserts.assertVirtualHost(TEST3_VIRTUALHOST, getRestTestHelper().find(VirtualHost.NAME, TEST3_VIRTUALHOST, virtualhosts));
- Asserts.assertVirtualHost(TEST2_VIRTUALHOST, getRestTestHelper().find(VirtualHost.NAME, TEST2_VIRTUALHOST, virtualhosts));
- Asserts.assertVirtualHost(TEST1_VIRTUALHOST, getRestTestHelper().find(VirtualHost.NAME, TEST1_VIRTUALHOST, virtualhosts));
+ for (String nodeName: EXPECTED_VIRTUALHOSTS)
+ {
+ Map<String, Object> nodeAttributes = getRestTestHelper().find(VirtualHostNode.NAME, nodeName, nodes);
+ assertNotNull("Node attributes are not found for node with name " + nodeName, nodeAttributes);
+ }
@SuppressWarnings("unchecked")
List<Map<String, Object>> ports = (List<Map<String, Object>>) brokerDetails.get(BROKER_PORTS_ATTRIBUTE);
@@ -227,7 +230,7 @@ public class BrokerRestTest extends Qpid
assertNotNull("Unexpected value of attribute " + Broker.ID, brokerDetails.get(Broker.ID));
assertNotNull("Unexpected value of attribute statistics", brokerDetails.get(BROKER_STATISTICS_ATTRIBUTE));
- assertNotNull("Unexpected value of attribute virtualhosts", brokerDetails.get(BROKER_VIRTUALHOSTS_ATTRIBUTE));
+ assertNotNull("Unexpected value of attribute virtual host nodes", brokerDetails.get(BROKER_VIRTUALHOST_NODES_ATTRIBUTE));
assertNotNull("Unexpected value of attribute ports", brokerDetails.get(BROKER_PORTS_ATTRIBUTE));
assertNotNull("Unexpected value of attribute authenticationproviders", brokerDetails.get(BROKER_AUTHENTICATIONPROVIDERS_ATTRIBUTE));
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Mon Apr 21 14:28:29 2014
@@ -98,7 +98,7 @@ public class ConnectionRestTest extends
public void testGetVirtualHostConnections() throws Exception
{
- List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("/rest/connection/test");
+ List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("/rest/connection/test/test");
assertEquals("Unexpected number of connections", 1, connections.size());
Asserts.assertConnection(connections.get(0), (AMQConnection) _connection);
}
@@ -108,7 +108,7 @@ public class ConnectionRestTest extends
// get connection name
String connectionName = getConnectionName();
- Map<String, Object> connectionDetails = getRestTestHelper().getJsonAsSingletonList("/rest/connection/test/"
+ Map<String, Object> connectionDetails = getRestTestHelper().getJsonAsSingletonList("/rest/connection/test/test/"
+ URLDecoder.decode(connectionName, "UTF-8"));
assertConnection(connectionDetails);
}
@@ -122,7 +122,7 @@ public class ConnectionRestTest extends
public void testGetVirtualHostSessions() throws Exception
{
- List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test");
+ List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test");
assertEquals("Unexpected number of sessions", 1, sessions.size());
assertSession(sessions.get(0), (AMQSession<?, ?>) _session);
}
@@ -132,7 +132,7 @@ public class ConnectionRestTest extends
// get connection name
String connectionName = getConnectionName();
- List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/"
+ List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test/"
+ URLDecoder.decode(connectionName, "UTF-8"));
assertEquals("Unexpected number of sessions", 1, sessions.size());
assertSession(sessions.get(0), (AMQSession<?, ?>) _session);
@@ -143,7 +143,7 @@ public class ConnectionRestTest extends
// get connection name
String connectionName = getConnectionName();
- List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/"
+ List<Map<String, Object>> sessions = getRestTestHelper().getJsonAsList("/rest/session/test/test/"
+ URLDecoder.decode(connectionName, "UTF-8") + "/" + ((AMQSession<?, ?>) _session).getChannelId());
assertEquals("Unexpected number of sessions", 1, sessions.size());
assertSession(sessions.get(0), (AMQSession<?, ?>) _session);
@@ -210,7 +210,7 @@ public class ConnectionRestTest extends
private String getConnectionName() throws IOException
{
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test");
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test/test");
@SuppressWarnings("unchecked")
List<Map<String, Object>> connections = (List<Map<String, Object>>) hostDetails
.get(VirtualHostRestTest.VIRTUALHOST_CONNECTIONS_ATTRIBUTE);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ExchangeRestTest.java Mon Apr 21 14:28:29 2014
@@ -64,7 +64,7 @@ public class ExchangeRestTest extends Qp
{
for (String exchangeName : EXPECTED_EXCHANGES)
{
- Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/"
+ Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/test/"
+ URLDecoder.decode(exchangeName, "UTF-8"));
assertExchange(exchangeName, exchange);
}
@@ -73,20 +73,22 @@ public class ExchangeRestTest extends Qp
public void testSetExchangeAttributesUnsupported() throws Exception
{
String exchangeName = getTestName();
+ String exchangeUrl = "/rest/exchange/test/test/" + exchangeName;
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Exchange.NAME, exchangeName);
attributes.put(Exchange.TYPE, "direct");
- int responseCode =getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "PUT", attributes);
+ int responseCode = getRestTestHelper().submitRequest(exchangeUrl, "PUT", attributes);
+ assertEquals("Exchange should be created", 201, responseCode);
- Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/" + exchangeName);
+ Map<String, Object> exchange = getRestTestHelper().getJsonAsSingletonList(exchangeUrl);
assertNotNull("Exchange not found", exchange);
attributes = new HashMap<String, Object>();
attributes.put(Exchange.NAME, exchangeName);
- attributes.put(Exchange.ALTERNATE_EXCHANGE, "my-alternate-exchange");
+ attributes.put(Exchange.ALTERNATE_EXCHANGE, "amq.direct");
- responseCode = getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(exchangeUrl, "PUT", attributes);
assertEquals("Exchange update should be unsupported", 409, responseCode);
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java Mon Apr 21 14:28:29 2014
@@ -29,6 +29,7 @@ import org.apache.qpid.server.model.Auth
import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -54,12 +55,12 @@ public class QpidRestTestCase extends Qp
getRestTestHelper().setUsernameAndPassword("webadmin", "webadmin");
//remove the normal 'test' vhost, we will configure the vhosts below
- getBrokerConfiguration(0).removeObjectConfiguration(VirtualHost.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+ getBrokerConfiguration(0).removeObjectConfiguration(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
// Set up virtualhost config with queues and bindings to the amq.direct
for (String virtualhost : EXPECTED_VIRTUALHOSTS)
{
- createTestVirtualHost(0, virtualhost);
+ createTestVirtualHostNode(0, virtualhost);
}
customizeConfiguration();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java Mon Apr 21 14:28:29 2014
@@ -104,7 +104,7 @@ public class QueueRestTest extends QpidR
public void testGetByName() throws Exception
{
String queueName = getTestQueueName();
- Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName);
Asserts.assertQueue(queueName, "standard", queueDetails);
assertStatistics(queueDetails);
@@ -130,9 +130,11 @@ public class QueueRestTest extends QpidR
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.NAME, queueName);
- int responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes);
+ String queueUrl = "/rest/queue/test/test/" + queueName;
+ int responseCode = getRestTestHelper().submitRequest(queueUrl, "PUT", attributes);
+ assertEquals("Queue was not created", 201, responseCode);
- Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList(queueUrl);
Asserts.assertQueue(queueName, "standard", queueDetails);
attributes = new HashMap<String, Object>();
@@ -146,10 +148,10 @@ public class QueueRestTest extends QpidR
attributes.put(Queue.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 50000);
attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
- responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(queueUrl, "PUT", attributes);
assertEquals("Setting of queue attributes should be allowed", 200, responseCode);
- Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList(queueUrl);
assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) );
assertEquals("Unexpected " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000, queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) );
assertEquals("Unexpected " + Queue.ALERT_REPEAT_GAP, 10000, queueData.get(Queue.ALERT_REPEAT_GAP) );
@@ -170,7 +172,7 @@ public class QueueRestTest extends QpidR
createBinding(bindingName, exchanges[i], queueName);
}
- Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName);
Asserts.assertQueue(queueName, "standard", queueDetails);
@SuppressWarnings("unchecked")
@@ -192,7 +194,7 @@ public class QueueRestTest extends QpidR
private void createBinding(String bindingName, String exchangeName, String queueName) throws IOException
{
HttpURLConnection connection = getRestTestHelper().openManagementConnection(
- "/rest/binding/test/" + URLDecoder.decode(exchangeName, "UTF-8") + "/" + queueName + "/" + bindingName,
+ "/rest/binding/test/test/" + URLDecoder.decode(exchangeName, "UTF-8") + "/" + queueName + "/" + bindingName,
"PUT");
Map<String, Object> bindingData = new HashMap<String, Object>();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java Mon Apr 21 14:28:29 2014
@@ -526,13 +526,15 @@ String dataAsString = new String(data);
Map<String, Object> queueData = new HashMap<String, Object>();
queueData.put(Queue.NAME, queueName);
queueData.put(Queue.DURABLE, Boolean.FALSE);
- submitRequest("/rest/queue/test/" + queueName, "PUT", queueData);
+ int responseCode = submitRequest("/rest/queue/test/test/" + queueName, "PUT", queueData);
+ Assert.assertEquals("Unexpected response code creating queue" + queueName, 201, responseCode);
Map<String, Object> bindingData = new HashMap<String, Object>();
bindingData.put(Binding.NAME, queueName);
bindingData.put(Binding.QUEUE, queueName);
bindingData.put(Binding.EXCHANGE, "amq.direct");
- submitRequest("/rest/binding/test/amq.direct/" + queueName + "/" + queueName, "PUT", queueData);
+ responseCode = submitRequest("/rest/binding/test/test/amq.direct/" + queueName + "/" + queueName, "PUT", queueData);
+ Assert.assertEquals("Unexpected response code binding queue " + queueName, 201, responseCode);
}
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java Mon Apr 21 14:28:29 2014
@@ -44,8 +44,8 @@ public class StructureRestTest extends Q
assertNode(structure, "Broker");
@SuppressWarnings("unchecked")
- List<Map<String, Object>> virtualhosts = (List<Map<String, Object>>) structure.get("virtualhosts");
- assertEquals("Unexpected number of virtual hosts", 3, virtualhosts.size());
+ List<Map<String, Object>> virtualhostnodes = (List<Map<String, Object>>) structure.get("virtualhostnodes");
+ assertEquals("Unexpected number of virtual hosts", 3, virtualhostnodes.size());
@SuppressWarnings("unchecked")
List<Map<String, Object>> ports = (List<Map<String, Object>>) structure.get("ports");
@@ -55,16 +55,20 @@ public class StructureRestTest extends Q
List<Map<String, Object>> providers = (List<Map<String, Object>>) structure.get("authenticationproviders");
assertEquals("Unexpected number of authentication providers", 2, providers.size());
- for (String hostName : EXPECTED_VIRTUALHOSTS)
+ for (String nodeName : EXPECTED_VIRTUALHOSTS)
{
- Map<String, Object> host = getRestTestHelper().find("name", hostName, virtualhosts);
- assertNotNull("Host " + hostName + " is not found ", host);
- assertNode(host, hostName);
+ Map<String, Object> node = getRestTestHelper().find("name", nodeName, virtualhostnodes);
+ assertNotNull("Node " + nodeName + " is not found ", node);
+ assertNode(node, nodeName);
}
String hostName = "test";
- Map<String, Object> host = getRestTestHelper().find("name", hostName, virtualhosts);
+ Map<String, Object> node = getRestTestHelper().find("name", hostName, virtualhostnodes);
+
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> virtualhosts = (List<Map<String, Object>>) node.get("virtualhosts");
+ Map<String, Object> host = getRestTestHelper().find("name", hostName, virtualhosts);
@SuppressWarnings("unchecked")
List<Map<String, Object>> queues = (List<Map<String, Object>>) host.get("queues");
assertNotNull("Host " + hostName + " queues are not found ", queues);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Mon Apr 21 14:28:29 2014
@@ -30,9 +30,6 @@ import java.util.Map;
import javax.jms.Session;
import javax.servlet.http.HttpServletResponse;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
@@ -40,10 +37,13 @@ import org.apache.qpid.server.model.Virt
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.store.MessageStore;
import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
-import org.apache.qpid.server.virtualhost.StandardVirtualHost;
+
+import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.util.FileUtils;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.map.JsonMappingException;
public class VirtualHostRestTest extends QpidRestTestCase
{
@@ -55,7 +55,7 @@ public class VirtualHostRestTest extends
public void testGet() throws Exception
{
- List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost/");
+ List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost");
assertNotNull("Hosts data cannot be null", hosts);
assertEquals("Unexpected number of hosts", EXPECTED_VIRTUALHOSTS.length, hosts.size());
for (String hostName : EXPECTED_VIRTUALHOSTS)
@@ -108,7 +108,7 @@ public class VirtualHostRestTest extends
public void testPutCreateVirtualHostUsingStoreType() throws Exception
{
String hostName = getTestName();
- String storeType = getTestProfileMessageStoreType();
+ String storeType = getTestProfileVirtualHostNodeType();
String storeLocation = createHost(hostName, storeType, null);
try
{
@@ -117,10 +117,6 @@ public class VirtualHostRestTest extends
Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostName);
Asserts.assertVirtualHost(hostName, hostDetails);
- @SuppressWarnings("unchecked")
- Map<String, Object> messageStoreSettings = (Map<String, Object>) hostDetails.get(VirtualHost.MESSAGE_STORE_SETTINGS);
- assertEquals("Unexpected store type", storeType, messageStoreSettings.get(MessageStore.STORE_TYPE));
-
assertNewVirtualHost(hostDetails);
}
finally
@@ -135,13 +131,10 @@ public class VirtualHostRestTest extends
public void testDeleteHost() throws Exception
{
String hostToDelete = TEST3_VIRTUALHOST;
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/virtualhost/" + hostToDelete, "DELETE");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/virtualhost/" + hostToDelete + "/" + hostToDelete, "DELETE");
connection.connect();
assertEquals("Unexpected response code", 200, connection.getResponseCode());
- // make sure that changes are saved in the broker store
- restartBroker();
-
List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost/" + hostToDelete);
assertEquals("Host should be deleted", 0, hosts.size());
}
@@ -161,32 +154,22 @@ public class VirtualHostRestTest extends
public void testUpdateActiveHostFails() throws Exception
{
String hostToUpdate = TEST3_VIRTUALHOST;
- Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostToUpdate);
+ String restHostUrl = "/rest/virtualhost/" + hostToUpdate + "/" + hostToUpdate;
+ Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList(restHostUrl);
Asserts.assertVirtualHost(hostToUpdate, hostDetails);
- @SuppressWarnings("unchecked")
- Map<String, Object> attributes = (Map<String, Object>)hostDetails.get(VirtualHost.MESSAGE_STORE_SETTINGS);
- String configPath = (String) attributes.get(MessageStore.STORE_PATH);
-
- String storeType = getTestProfileMessageStoreType();
- String storeLocation = getStoreLocation(hostToUpdate);
- Map<String, Object> newMessageStoreSettings = new HashMap<String, Object>();
- newMessageStoreSettings.put(MessageStore.STORE_TYPE, storeType);
- newMessageStoreSettings.put(MessageStore.STORE_PATH, storeLocation);
Map<String, Object> newAttributes = new HashMap<String, Object>();
newAttributes.put(VirtualHost.NAME, hostToUpdate);
- newAttributes.put(VirtualHost.MESSAGE_STORE_SETTINGS, newMessageStoreSettings);
+ newAttributes.put("fakeAttribute", "value");
- int response = getRestTestHelper().submitRequest("/rest/virtualhost/" + hostToUpdate, "PUT", newAttributes);
+ int response = getRestTestHelper().submitRequest(restHostUrl, "PUT", newAttributes);
assertEquals("Unexpected response code", 409, response);
restartBroker();
- Map<String, Object> rereadHostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/" + hostToUpdate);
+ Map<String, Object> rereadHostDetails = getRestTestHelper().getJsonAsSingletonList(restHostUrl);
Asserts.assertVirtualHost(hostToUpdate, rereadHostDetails);
- @SuppressWarnings("unchecked")
- Map<String, Object> rereadMessageStoreSettings = (Map<String,Object>)rereadHostDetails.get(VirtualHost.MESSAGE_STORE_SETTINGS);
- assertEquals("Unexpected config path", configPath, rereadMessageStoreSettings.get(MessageStore.STORE_PATH));
+ assertFalse(rereadHostDetails.containsKey("fakeAttribute"));
}
public void testPutCreateQueue() throws Exception
@@ -342,10 +325,14 @@ public class VirtualHostRestTest extends
String queueName = getTestQueueName();
createQueue(queueName, null, null);
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/" + queueName, "DELETE");
+ String queueUrl = "/rest/queue/test/test/" + queueName;
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList(queueUrl);
+ assertEquals("Queue should exist", 1, queues.size());
+
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection(queueUrl, "DELETE");
connection.connect();
assertEquals("Unexpected response code", 200, connection.getResponseCode());
- List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test/" + queueName);
+ queues = getRestTestHelper().getJsonAsList(queueUrl);
assertEquals("Queue should be deleted", 0, queues.size());
}
@@ -353,12 +340,12 @@ public class VirtualHostRestTest extends
{
String queueName = getTestQueueName();
createQueue(queueName, null, null);
- Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/test/" + queueName);
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test?id=" + queueDetails.get(Queue.ID), "DELETE");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/test?id=" + queueDetails.get(Queue.ID), "DELETE");
connection.connect();
assertEquals("Unexpected response code", 200, connection.getResponseCode());
- List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test/" + queueName);
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test/test/" + queueName);
assertEquals("Queue should be deleted", 0, queues.size());
}
@@ -367,10 +354,10 @@ public class VirtualHostRestTest extends
String exchangeName = getTestName();
createExchange(exchangeName, "direct");
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/" + exchangeName, "DELETE");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test/" + exchangeName, "DELETE");
connection.connect();
assertEquals("Unexpected response code", 200, connection.getResponseCode());
- List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/" + exchangeName);
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/test/" + exchangeName);
assertEquals("Exchange should be deleted", 0, queues.size());
}
@@ -378,12 +365,12 @@ public class VirtualHostRestTest extends
{
String exchangeName = getTestName();
createExchange(exchangeName, "direct");
- Map<String, Object> echangeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/" + exchangeName);
+ Map<String, Object> echangeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/exchange/test/test/" + exchangeName);
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test?id=" + echangeDetails.get(Exchange.ID), "DELETE");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test?id=" + echangeDetails.get(Exchange.ID), "DELETE");
connection.connect();
assertEquals("Unexpected response code", 200, connection.getResponseCode());
- List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/" + exchangeName);
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/exchange/test/test/" + exchangeName);
assertEquals("Exchange should be deleted", 0, queues.size());
}
@@ -479,7 +466,7 @@ public class VirtualHostRestTest extends
private void createExchange(String exchangeName, String exchangeType) throws IOException
{
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/" + exchangeName, "PUT");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/exchange/test/test/" + exchangeName, "PUT");
Map<String, Object> queueData = new HashMap<String, Object>();
queueData.put(Exchange.NAME, exchangeName);
@@ -502,7 +489,7 @@ public class VirtualHostRestTest extends
private int tryCreateQueue(String queueName, String queueType, Map<String, Object> attributes) throws IOException,
JsonGenerationException, JsonMappingException
{
- HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/" + queueName, "PUT");
+ HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/queue/test/test/" + queueName, "PUT");
Map<String, Object> queueData = new HashMap<String, Object>();
queueData.put(Queue.NAME, queueName);
@@ -536,20 +523,17 @@ public class VirtualHostRestTest extends
return new File(TMP_FOLDER, "store-" + hostName + "-" + System.currentTimeMillis()).getAbsolutePath();
}
- private int tryCreateVirtualHost(String hostName, String storeType, String storePath, String configPath) throws IOException,
+ private int tryCreateVirtualHost(String hostName, String virtualHostNodeType, String storePath, String configPath) throws IOException,
JsonGenerationException, JsonMappingException
{
- Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
- messageStoreSettings.put(MessageStore.STORE_PATH, storePath);
- messageStoreSettings.put(MessageStore.STORE_TYPE, storeType);
-
Map<String, Object> hostData = new HashMap<String, Object>();
- hostData.put(VirtualHost.NAME, hostName);
- hostData.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
- hostData.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
+ hostData.put(VirtualHostNode.NAME, hostName);
+ hostData.put(VirtualHostNode.TYPE, virtualHostNodeType);
+ hostData.put(VirtualHostNode.IS_MESSAGE_STORE_PROVIDER, true);
+ hostData.put(DurableConfigurationStore.STORE_PATH, storePath);
- return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
+ return getRestTestHelper().submitRequest("/rest/virtualhostnode/" + hostName, "PUT", hostData);
}
private void assertNewVirtualHost(Map<String, Object> hostDetails)
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Mon Apr 21 14:28:29 2014
@@ -29,7 +29,6 @@ import java.util.Map;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
-
import org.apache.qpid.server.management.plugin.HttpManagement;
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -40,17 +39,16 @@ import org.apache.qpid.server.model.Plug
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
import org.apache.qpid.server.security.FileKeyStore;
import org.apache.qpid.server.security.FileTrustStore;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
import org.apache.qpid.server.security.acl.AbstractACLTestCase;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManagerFactory;
import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory;
-import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.virtualhost.StandardVirtualHost;
+import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.systest.rest.QpidRestTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestFileUtils;
@@ -192,56 +190,56 @@ public class BrokerACLTest extends QpidR
provider.get(PlainPasswordFileAuthenticationManagerFactory.ATTRIBUTE_PATH));
}
- /* === VirtualHost === */
+ /* === VirtualHostNode === */
- public void testCreateVirtualHostAllowed() throws Exception
+ public void testCreateVirtualHostNodeAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
String hostName = getTestName();
- int responseCode = createHost(hostName);
+ int responseCode = createVirtualHostNode(hostName);
assertEquals("Host creation should be allowed", 201, responseCode);
- assertVirtualHostExists(hostName);
+ assertVirtualHostNodeExists(hostName);
}
- public void testCreateVirtualHostDenied() throws Exception
+ public void testCreateVirtualHostNodeDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
String hostName = getTestName();
- int responseCode = createHost(hostName);
- assertEquals("Host creation should be denied", 403, responseCode);
+ int responseCode = createVirtualHostNode(hostName);
+ assertEquals("Virtual host node creation should be denied", 403, responseCode);
- assertVirtualHostDoesNotExist(hostName);
+ assertVirtualHostNodeDoesNotExist(hostName);
}
- public void testDeleteVirtualHostAllowed() throws Exception
+ public void testDeleteVirtualHostNodeAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- assertVirtualHostExists(TEST2_VIRTUALHOST);
+ assertVirtualHostNodeExists(TEST2_VIRTUALHOST);
- int responseCode = getRestTestHelper().submitRequest("/rest/virtualhost/" + TEST2_VIRTUALHOST, "DELETE", null);
- assertEquals("Host deletion should be allowed", 200, responseCode);
+ int responseCode = getRestTestHelper().submitRequest("/rest/virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE", null);
+ assertEquals("Virtual host node deletion should be allowed", 200, responseCode);
- assertVirtualHostDoesNotExist(TEST2_VIRTUALHOST);
+ assertVirtualHostNodeDoesNotExist(TEST2_VIRTUALHOST);
}
- public void testDeleteVirtualHostDenied() throws Exception
+ public void testDeleteVirtualHostNodeDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- assertVirtualHostExists(TEST2_VIRTUALHOST);
+ assertVirtualHostNodeExists(TEST2_VIRTUALHOST);
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- int responseCode = getRestTestHelper().submitRequest("/rest/virtualhost/" + TEST2_VIRTUALHOST, "DELETE", null);
- assertEquals("Host deletion should be denied", 403, responseCode);
+ int responseCode = getRestTestHelper().submitRequest("/rest/virtualhostnode/" + TEST2_VIRTUALHOST, "DELETE", null);
+ assertEquals("Virtual host node deletion should be denied", 403, responseCode);
- assertVirtualHostExists(TEST2_VIRTUALHOST);
+ assertVirtualHostNodeExists(TEST2_VIRTUALHOST);
}
/* === Port === */
@@ -979,34 +977,30 @@ public class BrokerACLTest extends QpidR
assertEquals("Unexpected result", exists, !trustStores.isEmpty());
}
- private int createHost(String hostName) throws Exception
+ private int createVirtualHostNode(String virtualHostNodeName) throws Exception
{
- Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
- messageStoreSettings.put(MessageStore.STORE_PATH, getStoreLocation(hostName));
- messageStoreSettings.put(MessageStore.STORE_TYPE, getTestProfileMessageStoreType());
-
- Map<String, Object> hostData = new HashMap<String, Object>();
- hostData.put(VirtualHost.NAME, hostName);
- hostData.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
- hostData.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
+ Map<String, Object> data = new HashMap<String, Object>();
+ data.put(VirtualHostNode.NAME, virtualHostNodeName);
+ data.put(VirtualHostNode.TYPE, getTestProfileVirtualHostNodeType());
+ data.put(DurableConfigurationStore.STORE_PATH, getStoreLocation(virtualHostNodeName));
- return getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData);
+ return getRestTestHelper().submitRequest("/rest/virtualhostnode/" + virtualHostNodeName, "PUT", data);
}
- private void assertVirtualHostDoesNotExist(String hostName) throws Exception
+ private void assertVirtualHostNodeDoesNotExist(String name) throws Exception
{
- assertVirtualHostExistence(hostName, false);
+ assertVirtualHostNodeExistence(name, false);
}
- private void assertVirtualHostExists(String hostName) throws Exception
+ private void assertVirtualHostNodeExists(String name) throws Exception
{
- assertVirtualHostExistence(hostName, true);
+ assertVirtualHostNodeExistence(name, true);
}
- private void assertVirtualHostExistence(String hostName, boolean exists) throws Exception
+ private void assertVirtualHostNodeExistence(String name, boolean exists) throws Exception
{
- List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhost/" + hostName);
- assertEquals("Unexpected result", exists, !hosts.isEmpty());
+ List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("/rest/virtualhostnode/" + name);
+ assertEquals("Node " + name + (exists ? " does not exist" : " exists" ), exists, !hosts.isEmpty());
}
private String getStoreLocation(String hostName)
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java Mon Apr 21 14:28:29 2014
@@ -41,6 +41,8 @@ public class ExchangeRestACLTest extends
private static final String ALLOWED_USER = "user1";
private static final String DENIED_USER = "user2";
private String _queueName;
+ private String _exchangeName;
+ private String _exchangeUrl;
@Override
protected void customizeConfiguration() throws IOException
@@ -75,85 +77,78 @@ public class ExchangeRestACLTest extends
Map<String, Object> queueData = new HashMap<String, Object>();
queueData.put(Queue.NAME, _queueName);
queueData.put(Queue.DURABLE, Boolean.TRUE);
- int status = getRestTestHelper().submitRequest("/rest/queue/test/" + _queueName, "PUT", queueData);
+ int status = getRestTestHelper().submitRequest("/rest/queue/test/test/" + _queueName, "PUT", queueData);
assertEquals("Unexpected status", 201, status);
+ _exchangeName = getTestName();
+ _exchangeUrl = "/rest/exchange/test/test/" + _exchangeName;
}
public void testCreateExchangeAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
+ int responseCode = createExchange();
assertEquals("Exchange creation should be allowed", 201, responseCode);
- assertExchangeExists(exchangeName);
+ assertExchangeExists();
}
public void testCreateExchangeDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
+ int responseCode = createExchange();
assertEquals("Exchange creation should be denied", 403, responseCode);
- assertExchangeDoesNotExist(exchangeName);
+ assertExchangeDoesNotExist();
}
public void testDeleteExchangeAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
+ int responseCode = createExchange();
assertEquals("Exchange creation should be allowed", 201, responseCode);
- assertExchangeExists(exchangeName);
+ assertExchangeExists();
+
- responseCode = getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "DELETE", null);
+ responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE", null);
assertEquals("Exchange deletion should be allowed", 200, responseCode);
- assertExchangeDoesNotExist(TEST2_VIRTUALHOST);
+ assertExchangeDoesNotExist();
}
public void testDeleteExchangeDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
+ int responseCode = createExchange();
assertEquals("Exchange creation should be allowed", 201, responseCode);
- assertExchangeExists(exchangeName);
+ assertExchangeExists();
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- responseCode = getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "DELETE", null);
+ responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "DELETE", null);
assertEquals("Exchange deletion should be denied", 403, responseCode);
- assertExchangeExists(exchangeName);
+ assertExchangeExists();
}
public void testSetExchangeAttributesAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
+ int responseCode = createExchange();
- assertExchangeExists(exchangeName);
+ assertExchangeExists();
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Exchange.NAME, exchangeName);
+ attributes.put(Exchange.NAME, _exchangeName);
attributes.put(Exchange.ALTERNATE_EXCHANGE, "my-alternate-exchange");
- responseCode = getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "PUT", attributes);
assertEquals("Setting of exchange attribites should be allowed but it is currently unsupported", 409, responseCode);
}
@@ -161,18 +156,16 @@ public class ExchangeRestACLTest extends
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String exchangeName = getTestName();
-
- int responseCode = createExchange(exchangeName);
- assertExchangeExists(exchangeName);
+ int responseCode = createExchange();
+ assertExchangeExists();
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Exchange.NAME, exchangeName);
+ attributes.put(Exchange.NAME, _exchangeName);
attributes.put(Exchange.ALTERNATE_EXCHANGE, "my-alternate-exchange");
- responseCode = getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(_exchangeUrl, "PUT", attributes);
assertEquals("Setting of exchange attribites should be allowed", 403, responseCode);
}
@@ -198,27 +191,27 @@ public class ExchangeRestACLTest extends
assertBindingDoesNotExist(bindingName);
}
- private int createExchange(String exchangeName) throws Exception
+ private int createExchange() throws Exception
{
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Exchange.NAME, exchangeName);
+ attributes.put(Exchange.NAME, _exchangeName);
attributes.put(Exchange.TYPE, "direct");
- return getRestTestHelper().submitRequest("/rest/exchange/test/" + exchangeName, "PUT", attributes);
+ return getRestTestHelper().submitRequest(_exchangeUrl, "PUT", attributes);
}
- private void assertExchangeDoesNotExist(String exchangeName) throws Exception
+ private void assertExchangeDoesNotExist() throws Exception
{
- assertExchangeExistence(exchangeName, false);
+ assertExchangeExistence(false);
}
- private void assertExchangeExists(String exchangeName) throws Exception
+ private void assertExchangeExists() throws Exception
{
- assertExchangeExistence(exchangeName, true);
+ assertExchangeExistence(true);
}
- private void assertExchangeExistence(String exchangeName, boolean exists) throws Exception
+ private void assertExchangeExistence(boolean exists) throws Exception
{
- List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList("/rest/exchange/test/" + exchangeName);
+ List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList(_exchangeUrl);
assertEquals("Unexpected result", exists, !exchanges.isEmpty());
}
@@ -229,7 +222,7 @@ public class ExchangeRestACLTest extends
attributes.put(Binding.QUEUE, _queueName);
attributes.put(Binding.EXCHANGE, "amq.direct");
- int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/amq.direct/" + _queueName + "/" + bindingName, "PUT", attributes);
+ int responseCode = getRestTestHelper().submitRequest("/rest/binding/test/test/amq.direct/" + _queueName + "/" + bindingName, "PUT", attributes);
return responseCode;
}
@@ -245,7 +238,7 @@ public class ExchangeRestACLTest extends
private void assertBindingExistence(String bindingName, boolean exists) throws Exception
{
- List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/amq.direct/" + _queueName + "/" + bindingName);
+ List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test/test/amq.direct/" + _queueName + "/" + bindingName);
assertEquals("Unexpected result", exists, !bindings.isEmpty());
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java Mon Apr 21 14:28:29 2014
@@ -36,6 +36,16 @@ public class QueueRestACLTest extends Qp
{
private static final String ALLOWED_USER = "user1";
private static final String DENIED_USER = "user2";
+ private String _queueUrl;
+ private String _queueName;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ _queueName = getTestName();
+ _queueUrl = "/rest/queue/test/test/" + _queueName;
+ }
@Override
protected void customizeConfiguration() throws IOException
@@ -60,80 +70,72 @@ public class QueueRestACLTest extends Qp
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
+ int responseCode = createQueue();
assertEquals("Queue creation should be allowed", 201, responseCode);
- assertQueueExists(queueName);
+ assertQueueExists();
}
public void testCreateQueueDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
+ int responseCode = createQueue();
assertEquals("Queue creation should be denied", 403, responseCode);
- assertQueueDoesNotExist(queueName);
+ assertQueueDoesNotExist();
}
public void testDeleteQueueAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
+ int responseCode = createQueue();
assertEquals("Queue creation should be allowed", 201, responseCode);
- assertQueueExists(queueName);
+ assertQueueExists();
- responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "DELETE", null);
+ responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE", null);
assertEquals("Queue deletion should be allowed", 200, responseCode);
- assertQueueDoesNotExist(TEST2_VIRTUALHOST);
+ assertQueueDoesNotExist();
}
public void testDeleteQueueDenied() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
+ int responseCode = createQueue();
assertEquals("Queue creation should be allowed", 201, responseCode);
- assertQueueExists(queueName);
+ assertQueueExists();
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
- responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "DELETE", null);
+ responseCode = getRestTestHelper().submitRequest(_queueUrl, "DELETE", null);
assertEquals("Queue deletion should be denied", 403, responseCode);
- assertQueueExists(queueName);
+ assertQueueExists();
}
+
+
public void testSetQueueAttributesAllowed() throws Exception
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
+ int responseCode = createQueue();
- assertQueueExists(queueName);
+ assertQueueExists();
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Queue.NAME, queueName);
+ attributes.put(Queue.NAME, _queueName);
attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000);
attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000);
- responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(_queueUrl, "PUT", attributes);
assertEquals("Setting of queue attribites should be allowed", 200, responseCode);
- Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList(_queueUrl);
assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) );
assertEquals("Unexpected " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000, queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) );
}
@@ -142,47 +144,45 @@ public class QueueRestACLTest extends Qp
{
getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
- String queueName = getTestName();
-
- int responseCode = createQueue(queueName);
- assertQueueExists(queueName);
+ int responseCode = createQueue();
+ assertQueueExists();
getRestTestHelper().setUsernameAndPassword(DENIED_USER, DENIED_USER);
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Queue.NAME, queueName);
+ attributes.put(Queue.NAME, _queueName);
attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000);
attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000);
- responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes);
+ responseCode = getRestTestHelper().submitRequest(_queueUrl, "PUT", attributes);
assertEquals("Setting of queue attribites should be allowed", 403, responseCode);
- Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName);
+ Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList(_queueUrl);
assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 0, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) );
assertEquals("Unexpected " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 0, queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) );
}
- private int createQueue(String queueName) throws Exception
+ private int createQueue() throws Exception
{
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Queue.NAME, queueName);
+ attributes.put(Queue.NAME, _queueName);
- return getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes);
+ return getRestTestHelper().submitRequest(_queueUrl, "PUT", attributes);
}
- private void assertQueueDoesNotExist(String queueName) throws Exception
+ private void assertQueueDoesNotExist() throws Exception
{
- assertQueueExistence(queueName, false);
+ assertQueueExistence(false);
}
- private void assertQueueExists(String queueName) throws Exception
+ private void assertQueueExists() throws Exception
{
- assertQueueExistence(queueName, true);
+ assertQueueExistence(true);
}
- private void assertQueueExistence(String queueName, boolean exists) throws Exception
+ private void assertQueueExistence(boolean exists) throws Exception
{
- List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("/rest/queue/test/" + queueName);
+ List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList(_queueUrl);
assertEquals("Unexpected result", exists, !queues.isEmpty());
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java Mon Apr 21 14:28:29 2014
@@ -48,7 +48,6 @@ import javax.naming.InitialContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.qpid.client.AMQAnyDestination;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQDestination;
@@ -57,9 +56,7 @@ import org.apache.qpid.client.AMQSession
import org.apache.qpid.client.message.QpidMessageProperties;
import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
import org.apache.qpid.messaging.Address;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.transport.ExecutionErrorCode;
public class AddressBasedDestinationTest extends QpidBrokerTestCase
@@ -70,10 +67,6 @@ public class AddressBasedDestinationTest
@Override
public void setUp() throws Exception
{
- TestBrokerConfiguration config = getBrokerConfiguration();
- config.setObjectAttribute(VirtualHost.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.CONTEXT,
- Collections.singletonMap("queue.maximumDeliveryAttempts","0"));
-
super.setUp();
_connection = getConnection() ;
_connection.start();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java Mon Apr 21 14:28:29 2014
@@ -31,14 +31,12 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.SlowMessageStore;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.test.utils.TestBrokerConfiguration;
+import org.apache.qpid.test.utils.TestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This tests that when the commit takes a long time(due to POST_COMMIT_DELAY) that the commit does not timeout
@@ -66,8 +64,7 @@ public class SyncWaitDelayTest extends Q
messageStoreSettings.put(MessageStore.STORE_TYPE, SlowMessageStore.TYPE);
messageStoreSettings.put(SlowMessageStore.DELAYS, slowMessageStoreDelays);
- TestBrokerConfiguration config = getBrokerConfiguration();
- config.setObjectAttribute(VirtualHost.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
+ TestUtils.createStoreWithVirtualHostEntry(messageStoreSettings, getBrokerConfiguration(), getTestProfileVirtualHostNodeType());
super.setUp();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Apr 21 14:28:29 2014
@@ -49,7 +49,6 @@ import javax.naming.NamingException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQConnectionURL;
@@ -66,6 +65,8 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MemoryMessageStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.virtualhost.StandardVirtualHost;
@@ -246,12 +247,7 @@ public class QpidBrokerTestCase extends
configuration.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_JMX_PORT, Port.PORT, getManagementPort(actualPort) + JMXPORT_CONNECTORSERVER_OFFSET);
String workDir = System.getProperty("QPID_WORK") + File.separator + TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST + File.separator + actualPort;
- Map<String, Object> virtualHostSettings = configuration.getObjectAttributes(VirtualHost.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
-
- @SuppressWarnings("unchecked")
- Map<String, Object> storeSettings = (Map<String, Object>)virtualHostSettings.get(VirtualHost.MESSAGE_STORE_SETTINGS);
- storeSettings.put(MessageStore.STORE_PATH, workDir);
- configuration.setObjectAttribute(VirtualHost.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHost.MESSAGE_STORE_SETTINGS, storeSettings);
+ configuration.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, DurableConfigurationStore.STORE_PATH, workDir);
}
return configuration;
@@ -844,13 +840,13 @@ public class QpidBrokerTestCase extends
}
/**
- * Creates a new virtual host within the test virtualhost file.
+ * Creates a new virtual host node in broker configuration for given broker port
* @param brokerPort broker port
- * @param virtualHostName virtual host name
+ * @param virtualHostNodeName virtual host node name
*/
- protected void createTestVirtualHost(int brokerPort, String virtualHostName)
+ protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName)
{
- String storeType = getTestProfileMessageStoreType();
+ String storeType = getTestProfileVirtualHostNodeType();
String storeDir = null;
if (System.getProperty("profile", "").startsWith("java-dby-mem"))
@@ -859,19 +855,20 @@ public class QpidBrokerTestCase extends
}
else if (!MemoryMessageStore.TYPE.equals(storeType))
{
- storeDir = "${QPID_WORK}" + File.separator + virtualHostName + File.separator + brokerPort;
+ storeDir = "${QPID_WORK}" + File.separator + virtualHostNodeName + File.separator + brokerPort;
}
// add new virtual host configuration to the broker store
Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(VirtualHost.NAME, virtualHostName);
- attributes.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
- Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
- messageStoreSettings.put(MessageStore.STORE_TYPE, storeType);
- messageStoreSettings.put(MessageStore.STORE_PATH, storeDir);
- attributes.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings );
+ attributes.put(VirtualHostNode.NAME, virtualHostNodeName);
+ attributes.put(VirtualHostNode.TYPE, storeType);
+ attributes.put(VirtualHostNode.IS_MESSAGE_STORE_PROVIDER, true);
+ if (storeDir != null)
+ {
+ attributes.put(DurableConfigurationStore.STORE_PATH, storeDir);
+ }
int port = getPort(brokerPort);
- getBrokerConfiguration(port).addObjectConfiguration(VirtualHost.class, attributes);
+ getBrokerConfiguration(port).addObjectConfiguration(VirtualHostNode.class, attributes);
}
/**
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Mon Apr 21 14:28:29 2014
@@ -50,6 +50,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
+import org.apache.qpid.util.Strings;
public class TestBrokerConfiguration
{
@@ -85,6 +86,34 @@ public class TestBrokerConfiguration
intialStoreLocation,
null,
Collections.<String,String>emptyMap());
+ _store.visitConfiguredObjectRecords(new ConfiguredObjectRecordHandler()
+ {
+ @Override
+ public boolean handle(ConfiguredObjectRecord record)
+ {
+ Map<String, Object> attributes = record.getAttributes();
+ String rawType = (String)attributes.get("type");
+ if (rawType != null)
+ {
+ String interpolatedType = Strings.expand(rawType, false, Strings.ENV_VARS_RESOLVER, Strings.JAVA_SYS_PROPS_RESOLVER);
+ if (!interpolatedType.equals(rawType))
+ {
+ setObjectAttribute(record, "type", interpolatedType);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public void end()
+ {
+ }
+
+ @Override
+ public void begin()
+ {
+ }
+ });
}
public boolean setBrokerAttribute(String name, Object value)
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java?rev=1588886&r1=1588885&r2=1588886&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java Mon Apr 21 14:28:29 2014
@@ -20,9 +20,27 @@
*/
package org.apache.qpid.test.utils;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostNode;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
+import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.JsonFileConfigStore;
+import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.virtualhost.StandardVirtualHost;
+import org.apache.qpid.util.Strings;
public class TestUtils
{
@@ -51,4 +69,48 @@ public class TestUtils
}
return dump.toString();
}
+
+ public static String createStoreWithVirtualHostEntry(Map<String, Object> messageStoreSettings, TestBrokerConfiguration config, String configStoreType)
+ {
+ UUID virtualHostId = UUID.randomUUID();
+ Map<String, Object> virtualHostAttributes = new HashMap<String, Object>();
+ virtualHostAttributes.put(VirtualHost.NAME, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+ virtualHostAttributes.put(VirtualHost.ID, virtualHostId);
+ virtualHostAttributes.put(VirtualHost.TYPE, StandardVirtualHost.TYPE);
+ virtualHostAttributes.put(VirtualHost.MESSAGE_STORE_SETTINGS, messageStoreSettings);
+ virtualHostAttributes.put(VirtualHost.MODEL_VERSION, BrokerModel.MODEL_VERSION);
+
+ config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.IS_MESSAGE_STORE_PROVIDER, false);
+ // If using MMS, switch to split store with JSON config store.
+ if (MemoryMessageStore.TYPE.equals(configStoreType))
+ {
+ configStoreType = JsonFileConfigStore.TYPE;
+ }
+ DurableConfigurationStoreFactory storeFactory = DurableConfigurationStoreFactory.FACTORY_LOADER.get(configStoreType);
+ DurableConfigurationStore store = storeFactory.createDurableConfigurationStore();
+
+ config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.TYPE, configStoreType);
+
+ Map<String,Object> nodeAttributes = config.getObjectAttributes(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+ String storePath = (String)nodeAttributes.get(DurableConfigurationStore.STORE_PATH);
+ String path = Strings.expand(storePath, false, Strings.JAVA_SYS_PROPS_RESOLVER, Strings.ENV_VARS_RESOLVER);
+
+ Map<String, Object> attributes = new HashMap<String, Object>(nodeAttributes);
+ attributes.put(DurableConfigurationStore.STORE_PATH, path);
+
+ VirtualHostNode<?> virtualHostNode = mock(VirtualHostNode.class);
+ when(virtualHostNode.getModel()).thenReturn(BrokerModel.getInstance());
+ when(virtualHostNode.getName()).thenReturn(TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+
+ try
+ {
+ store.openConfigurationStore(virtualHostNode, attributes);
+ store.create(new ConfiguredObjectRecordImpl(virtualHostId, VirtualHost.class.getSimpleName(), virtualHostAttributes));
+ }
+ finally
+ {
+ store.closeConfigurationStore();
+ }
+ return path;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org