diff options
| author | Alex Rudyy <orudyy@apache.org> | 2015-03-16 11:02:59 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2015-03-16 11:02:59 +0000 |
| commit | f433cd264f9840a82ebade37c68442a1e10de78d (patch) | |
| tree | 9f803c27b08d68546064a0fbfbdc52a82b8de76c /qpid/java | |
| parent | 15a0805961d67db689552c1a2494909b29d1cb00 (diff) | |
| download | qpid-python-f433cd264f9840a82ebade37c68442a1e10de78d.tar.gz | |
QPID-6449: Fix failing tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666959 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
2 files changed, 2 insertions, 6 deletions
diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java index 6d3bacc286..12841b448f 100644 --- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java +++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java @@ -35,6 +35,7 @@ import com.sleepycat.je.Durability; import com.sleepycat.je.EnvironmentConfig; import com.sleepycat.je.rep.ReplicatedEnvironment; import com.sleepycat.je.rep.ReplicationConfig; +import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet; import org.apache.qpid.server.model.RemoteReplicationNode; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; @@ -242,7 +243,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase // try to add not permitted node Map<String, Object> nodeData = createNodeAttributeMap(NODE2, intruderPort, _node1HaPort); - getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE2, "PUT", nodeData, HttpServletResponse.SC_CONFLICT); + getRestTestHelper().submitRequest(_baseNodeRestUrl + NODE2, "PUT", nodeData, RestServlet.SC_UNPROCESSABLE_ENTITY); assertRemoteNodes(NODE1, NODE3); } diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java index 69db2747c7..083187b8db 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java @@ -139,8 +139,6 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(url + "/" + nodeName); Asserts.assertVirtualHostNode(nodeName, virtualhostNode); - // verify that second create request fails - getRestTestHelper().submitRequest(url, "POST", nodeData, HttpServletResponse.SC_CONFLICT); } public void testCreateVirtualHostNodeByPutUsingParentURI() throws Exception @@ -155,9 +153,6 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase Map<String, Object> virtualhostNode = getRestTestHelper().getJsonAsSingletonList(url + "/" + nodeName); Asserts.assertVirtualHostNode(nodeName, virtualhostNode); - - // verify that second create request fails - getRestTestHelper().submitRequest(url, "PUT", nodeData, HttpServletResponse.SC_CONFLICT); } private void createAndDeleteVirtualHostNode(final String virtualhostNodeType, |