From 592669bad63f5579d3516f41ea143c9a549a261a Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Mon, 18 Mar 2013 18:12:57 +0000 Subject: QPID-4657: Add UI into java broker web management console to add/edit/delete ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1457903 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/systest/rest/BrokerRestTest.java | 2 +- .../org/apache/qpid/systest/rest/PortRestTest.java | 21 ++++++++++++++++++--- .../apache/qpid/systest/rest/QpidRestTestCase.java | 2 ++ .../apache/qpid/systest/rest/StructureRestTest.java | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) (limited to 'qpid/java/systests') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java index 4db83387e5..63691e9915 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java @@ -62,7 +62,7 @@ public class BrokerRestTest extends QpidRestTestCase @SuppressWarnings("unchecked") List> ports = (List>) brokerDetails.get(BROKER_PORTS_ATTRIBUTE); - assertEquals("Unexpected number of ports", 4, ports.size()); + assertEquals("Unexpected number of ports", 2, ports.size()); for (Map port : ports) { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java index a9b6657dbd..9302ac88de 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PortRestTest.java @@ -40,7 +40,7 @@ public class PortRestTest extends QpidRestTestCase { List> ports = getRestTestHelper().getJsonAsList("/rest/port/"); assertNotNull("Port data cannot be null", ports); - assertEquals("Unexpected number of ports", 4, ports.size()); + assertEquals("Unexpected number of ports", 2, ports.size()); String httpPortName = TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT; Map portData = getRestTestHelper().find(Port.NAME, httpPortName, ports); @@ -57,7 +57,7 @@ public class PortRestTest extends QpidRestTestCase { List> ports = getRestTestHelper().getJsonAsList("/rest/port/"); assertNotNull("Ports data cannot be null", ports); - assertEquals("Unexpected number of ports", 4, ports.size()); + assertEquals("Unexpected number of ports", 2, ports.size()); for (Map portMap : ports) { String portName = (String) portMap.get(Port.NAME); @@ -115,6 +115,15 @@ public class PortRestTest extends QpidRestTestCase portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); assertNotNull("Port details cannot be null", portDetails); assertEquals("Unexpected number of ports with name " + portName, 1, portDetails.size()); + + // try to add a second RMI port + attributes = new HashMap(); + attributes.put(Port.NAME, portName + 2); + attributes.put(Port.PORT, findFreePort()); + attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI)); + + responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + assertEquals("Adding of a second RMI port should fail", 409, responseCode); } public void testPutCreateAndUpdateAmqpPort() throws Exception @@ -145,7 +154,13 @@ public class PortRestTest extends QpidRestTestCase attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.AMQP_0_9_1)); responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); - assertEquals("Unexpected response code for port update", 200, responseCode); + assertEquals("Port cannot be updated in non management mode", 409, responseCode); + + stopBroker(); + startBroker(DEFAULT_PORT, true); + + responseCode = getRestTestHelper().submitRequest("/rest/port/" + portName, "PUT", attributes); + assertEquals("Port should be allwed to update in a management mode", 200, responseCode); portDetails = getRestTestHelper().getJsonAsList("/rest/port/" + portName); assertNotNull("Port details cannot be null", portDetails); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java index 671bdd7eb8..e2b73aa2b5 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java @@ -75,6 +75,8 @@ public class QpidRestTestCase extends QpidBrokerTestCase TestBrokerConfiguration config = getBrokerConfiguration(); config.addHttpManagementConfiguration(); config.setObjectAttribute(TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, _restTestHelper.getHttpPort()); + config.removeObjectConfiguration(TestBrokerConfiguration.ENTRY_NAME_JMX_PORT); + config.removeObjectConfiguration(TestBrokerConfiguration.ENTRY_NAME_RMI_PORT); } public RestTestHelper getRestTestHelper() diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java index 427934fac2..f5e326f90b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java @@ -41,7 +41,7 @@ public class StructureRestTest extends QpidRestTestCase @SuppressWarnings("unchecked") List> ports = (List>) structure.get("ports"); - assertEquals("Unexpected number of ports", 4, ports.size()); + assertEquals("Unexpected number of ports", 2, ports.size()); @SuppressWarnings("unchecked") List> providers = (List>) structure.get("authenticationproviders"); -- cgit v1.2.1