Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java Mon May 11 13:36:27 2015 @@ -119,11 +119,8 @@ public class TrustStoreRestTest extends createTrustStore(name, false, TestSSLConstants.TRUSTSTORE, TestSSLConstants.TRUSTSTORE_PASSWORD); assertNumberOfTrustStores(2); - getRestTestHelper().submitRequest("truststore/" + name , "DELETE", HttpServletResponse.SC_OK); - - List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/" + name); - assertNotNull("details should not be null", trustStore); - assertTrue("details should be empty as the truststore no longer exists", trustStore.isEmpty()); + getRestTestHelper().submitRequest("truststore/" + name, "DELETE", HttpServletResponse.SC_OK); + getRestTestHelper().submitRequest("truststore/" + name, "GET", HttpServletResponse.SC_NOT_FOUND); //check only the default systests trust store remains List<Map<String, Object>> trustStores = assertNumberOfTrustStores(1);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserRestTest.java Mon May 11 13:36:27 2015 @@ -126,9 +126,7 @@ public class UserRestTest extends QpidRe String url = "user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName; getRestTestHelper().submitRequest(url, "POST", userAttributes, HttpServletResponse.SC_NOT_FOUND); - - List<Map<String, Object>> userDetails = getRestTestHelper().getJsonAsList(url); - assertTrue("User should not be created", userDetails.isEmpty()); + getRestTestHelper().submitRequest(url, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testDelete() throws Exception @@ -142,9 +140,8 @@ public class UserRestTest extends QpidRe getRestTestHelper().removeUserById(id); - List<Map<String, Object>> users = getRestTestHelper().getJsonAsList("user/" - + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + userName); - assertEquals("User should be deleted", 0, users.size()); + getRestTestHelper().submitRequest("user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + + "/" + userName, "GET", HttpServletResponse.SC_NOT_FOUND); } private void assertUser(Map<String, Object> user) Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java Mon May 11 13:36:27 2015 @@ -97,12 +97,10 @@ public class VirtualHostNodeRestTest ex Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(restUrl); Asserts.assertVirtualHostNode(nodeName, virtualhostNode); assertNull("Virtualhostnode should not automatically get a virtualhost child", - virtualhostNode.get("virtualhosts")); + virtualhostNode.get("virtualhosts")); getRestTestHelper().submitRequest(restUrl, "DELETE", HttpServletResponse.SC_OK); - - List<Map<String, Object>> virtualHostNodes = getRestTestHelper().getJsonAsList(restUrl); - assertEquals("Host should be deleted", 0, virtualHostNodes.size()); + getRestTestHelper().submitRequest(restUrl, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testRecoverVirtualHostNodeWithDesiredStateStopped() throws Exception @@ -191,12 +189,10 @@ public class VirtualHostNodeRestTest ex Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(restUrl); Asserts.assertVirtualHostNode(nodeName, virtualhostNode); assertNull("Virtualhostnode should not automatically get a virtualhost child", - virtualhostNode.get("virtualhosts")); + virtualhostNode.get("virtualhosts")); getRestTestHelper().submitRequest(restUrl, "DELETE", HttpServletResponse.SC_OK); - - List<Map<String, Object>> virtualHostNodes = getRestTestHelper().getJsonAsList(restUrl); - assertEquals("Host should be deleted", 0, virtualHostNodes.size()); + getRestTestHelper().submitRequest(restUrl, "GET", HttpServletResponse.SC_NOT_FOUND); } private void assertActualAndDesireStates(final String restUrl, Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Mon May 11 13:36:27 2015 @@ -166,8 +166,8 @@ public class VirtualHostRestTest extends Map<String, Object> data = submitVirtualHost(false, "POST", HttpServletResponse.SC_NOT_FOUND); String hostName = (String)data.get(VirtualHost.NAME); - List<Map<String, Object>> hostDetails = getRestTestHelper().getJsonAsList("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName); - assertTrue("VH should not exist", hostDetails.isEmpty()); + getRestTestHelper().submitRequest("virtualhost/" + EMPTY_VIRTUALHOSTNODE_NAME + "/" + hostName, + "GET", HttpServletResponse.SC_NOT_FOUND); } public void testDeleteHost() throws Exception @@ -449,8 +449,8 @@ public class VirtualHostRestTest extends int statusCode = getRestTestHelper().submitRequest(queueUrl, "DELETE"); assertEquals("Unexpected response code", 200, statusCode); - queues = getRestTestHelper().getJsonAsList(queueUrl); - assertEquals("Queue should be deleted", 0, queues.size()); + + getRestTestHelper().submitRequest(queueUrl, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testDeleteQueueById() throws Exception @@ -460,8 +460,7 @@ public class VirtualHostRestTest extends Map<String, Object> queueDetails = getRestTestHelper().getJsonAsSingletonList("queue/test/test/" + queueName); int statusCode = getRestTestHelper().submitRequest("queue/test/test?id=" + queueDetails.get(Queue.ID), "DELETE"); assertEquals("Unexpected response code", 200, statusCode); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName); - assertEquals("Queue should be deleted", 0, queues.size()); + getRestTestHelper().submitRequest("queue/test/test/" + queueName, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testDeleteExchange() throws Exception @@ -472,8 +471,7 @@ public class VirtualHostRestTest extends int statusCode = getRestTestHelper().submitRequest("exchange/test/test/" + exchangeName, "DELETE"); assertEquals("Unexpected response code", 200, statusCode); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("exchange/test/test/" + exchangeName); - assertEquals("Exchange should be deleted", 0, queues.size()); + getRestTestHelper().submitRequest("exchange/test/test/" + exchangeName, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testDeleteExchangeById() throws Exception @@ -485,8 +483,7 @@ public class VirtualHostRestTest extends int statusCode = getRestTestHelper().submitRequest("exchange/test/test?id=" + echangeDetails.get(Exchange.ID), "DELETE"); assertEquals("Unexpected response code", 200, statusCode); - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList("exchange/test/test/" + exchangeName); - assertEquals("Exchange should be deleted", 0, queues.size()); + getRestTestHelper().submitRequest("exchange/test/test/" + exchangeName, "GET", HttpServletResponse.SC_NOT_FOUND); } public void testPutCreateQueueWithAttributes() throws Exception Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java Mon May 11 13:36:27 2015 @@ -27,6 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; @@ -854,20 +856,24 @@ public class BrokerACLTest extends QpidR private void assertPortExistence(String portName, boolean exists) throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("port/" + portName); - assertEquals("Unexpected result", exists, !hosts.isEmpty()); + String path = "port/" + portName; + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); + } private void assertKeyStoreExistence(String keyStoreName, boolean exists) throws Exception { - List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/" + keyStoreName); - assertEquals("Unexpected result", exists, !keyStores.isEmpty()); + String path = "keystore/" + keyStoreName; + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private void assertTrustStoreExistence(String trustStoreName, boolean exists) throws Exception { - List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore/" + trustStoreName); - assertEquals("Unexpected result", exists, !trustStores.isEmpty()); + String path = "truststore/" + trustStoreName; + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private int createAuthenticationProvider(String authenticationProviderName) throws Exception @@ -892,8 +898,8 @@ public class BrokerACLTest extends QpidR private void assertAuthenticationProviderExistence(String authenticationProviderName, boolean exists) throws Exception { String path = "authenticationprovider/" + authenticationProviderName; - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); - assertEquals("Unexpected result", exists, !providers.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private int createKeyStore(String name, String certAlias) throws IOException, JsonGenerationException, JsonMappingException @@ -921,8 +927,8 @@ public class BrokerACLTest extends QpidR private void assertGroupProviderExistence(String groupProviderName, boolean exists) throws Exception { String path = "groupprovider/" + groupProviderName; - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); - assertEquals("Unexpected result", exists, !providers.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private int createGroupProvider(String groupProviderName) throws Exception @@ -939,8 +945,8 @@ public class BrokerACLTest extends QpidR private void assertAccessControlProviderExistence(String accessControlProviderName, boolean exists) throws Exception { String path = "accesscontrolprovider/" + accessControlProviderName; - List<Map<String, Object>> providers = getRestTestHelper().getJsonAsList(path); - assertEquals("Unexpected result", exists, !providers.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private int createAccessControlProvider(String accessControlProviderName) throws Exception Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/ExchangeRestACLTest.java Mon May 11 13:36:27 2015 @@ -37,6 +37,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + public class ExchangeRestACLTest extends QpidRestTestCase { private static final String ALLOWED_USER = "user1"; @@ -212,8 +214,8 @@ public class ExchangeRestACLTest extends private void assertExchangeExistence(boolean exists) throws Exception { - List<Map<String, Object>> exchanges = getRestTestHelper().getJsonAsList(_exchangeUrl); - assertEquals("Unexpected result", exists, !exchanges.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(_exchangeUrl, "GET", expectedResponseCode); } private int createBinding(String bindingName) throws IOException, JsonGenerationException, JsonMappingException @@ -239,7 +241,7 @@ public class ExchangeRestACLTest extends private void assertBindingExistence(String bindingName, boolean exists) throws Exception { - List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("binding/test/test/amq.direct/" + _queueName + "/" + bindingName); - assertEquals("Unexpected result", exists, !bindings.isEmpty()); + String path = "binding/test/test/amq.direct/" + _queueName + "/" + bindingName; + getRestTestHelper().submitRequest(path, "GET", exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java Mon May 11 13:36:27 2015 @@ -25,6 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletResponse; + import org.apache.qpid.server.management.plugin.HttpManagement; import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.Queue; @@ -182,7 +184,7 @@ public class QueueRestACLTest extends Qp private void assertQueueExistence(boolean exists) throws Exception { - List<Map<String, Object>> queues = getRestTestHelper().getJsonAsList(_queueUrl); - assertEquals("Unexpected result", exists, !queues.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(_queueUrl, "GET", expectedResponseCode); } } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java Mon May 11 13:36:27 2015 @@ -178,8 +178,7 @@ public class UserRestACLTest extends Qpi private void assertUserDoesNotExist(String newUser) throws JsonParseException, JsonMappingException, IOException { String path = "user/" + TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER + "/" + newUser; - List<Map<String, Object>> userDetailsList = getRestTestHelper().getJsonAsList(path); - assertTrue(userDetailsList.isEmpty()); + getRestTestHelper().submitRequest(path, "GET", HttpServletResponse.SC_NOT_FOUND); } private void assertUserExists(String username) throws IOException Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostACLTest.java Mon May 11 13:36:27 2015 @@ -133,8 +133,9 @@ public class VirtualHostACLTest extends private void assertVirtualHostExistence(final String virtualHostNodeName, String virtualHostName, boolean exists) throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhost/" + virtualHostNodeName + "/" + virtualHostName); - assertEquals("Node " + virtualHostName + (exists ? " does not exist" : " exists"), exists, !hosts.isEmpty()); + String path = "virtualhost/" + virtualHostNodeName + "/" + virtualHostName; + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest(path, "GET", expectedResponseCode); } private String getStoreLocation(String hostName) Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java?rev=1678753&r1=1678752&r2=1678753&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostNodeACLTest.java Mon May 11 13:36:27 2015 @@ -143,8 +143,8 @@ public class VirtualHostNodeACLTest exte private void assertVirtualHostNodeExistence(String name, boolean exists) throws Exception { - List<Map<String, Object>> hosts = getRestTestHelper().getJsonAsList("virtualhostnode/" + name); - assertEquals("Node " + name + (exists ? " does not exist" : " exists"), exists, !hosts.isEmpty()); + int expectedResponseCode = exists ? HttpServletResponse.SC_OK : HttpServletResponse.SC_NOT_FOUND; + getRestTestHelper().submitRequest("virtualhostnode/" + name, "GET", expectedResponseCode); } private String getStoreLocation(String hostName) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
