diff options
Diffstat (limited to 'qpid/java/bdbstore/systests')
2 files changed, 6 insertions, 8 deletions
diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java index 507ff07ee5..675b052a91 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeRestTest.java @@ -38,8 +38,6 @@ import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; import org.apache.qpid.systest.rest.QpidRestTestCase; import org.apache.qpid.test.utils.TestBrokerConfiguration; import org.apache.qpid.util.FileUtils; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.map.JsonMappingException; public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase { @@ -97,7 +95,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase config.removeObjectConfiguration(VirtualHostNode.class, TEST3_VIRTUALHOST); } - public void testCreate3NodesCluster() throws Exception + public void testCreate3NodeGroup() throws Exception { createHANode(NODE1, _node1HaPort, _node1HaPort); assertNode(NODE1, _node1HaPort, _node1HaPort, NODE1); @@ -173,7 +171,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase assertEquals("Unexpected number of remote nodes on " + NODE2, 1, data.size()); } - private void createHANode(String nodeName, int nodePort, int helperPort) throws IOException, JsonGenerationException, JsonMappingException + private void createHANode(String nodeName, int nodePort, int helperPort) throws Exception { Map<String, Object> nodeData = new HashMap<String, Object>(); nodeData.put(BDBHAVirtualHostNode.NAME, nodeName); diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java index c184ef8f8d..0ab10cc318 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/HAClusterManagementTest.java @@ -191,7 +191,7 @@ public class HAClusterManagementTest extends QpidBrokerTestCase catch (Exception e) { String message = e.getMessage(); - assertEquals("The virtual hosts state of PASSIVE does not permit this operation.", message); + assertEquals("The virtual host state of UNAVAILABLE does not permit this operation.", message); } try @@ -202,7 +202,7 @@ public class HAClusterManagementTest extends QpidBrokerTestCase catch (Exception e) { String message = e.getMessage(); - assertEquals("The virtual hosts state of PASSIVE does not permit this operation.", message); + assertEquals("The virtual host state of UNAVAILABLE does not permit this operation.", message); } } @@ -243,11 +243,11 @@ public class HAClusterManagementTest extends QpidBrokerTestCase catch (Exception e) { String message = e.getMessage(); - assertEquals("The virtual hosts state of PASSIVE does not permit this operation.", message); + assertEquals("The virtual host state of UNAVAILABLE does not permit this operation.", message); } Map<String, Object> attributes = _clusterCreator.getNodeAttributes(inactiveBrokerPort); - assertEquals("Inactive broker has unexpeced role", "REPLICA", attributes.get(BDBHAVirtualHostNode.ROLE)); + assertEquals("Inactive broker has unexpected role", "REPLICA", attributes.get(BDBHAVirtualHostNode.ROLE)); _clusterCreator.setNodeAttributes(inactiveBrokerPort, Collections.<String, Object>singletonMap(BDBHAVirtualHostNode.ROLE, "MASTER")); _clusterCreator.awaitNodeToAttainRole(inactiveBrokerPort, "MASTER"); |