diff options
| author | Keith Wall <kwall@apache.org> | 2014-09-03 05:06:14 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-09-03 05:06:14 +0000 |
| commit | d67b476dcb97b16e784d0008f5c641132969ed51 (patch) | |
| tree | b83a457fb0522fbfb4afe5a06650219e990b301c /qpid/java/bdbstore/src/test | |
| parent | 4e794e4b1157995e544b9a501b39a13d002e0b10 (diff) | |
| download | qpid-python-d67b476dcb97b16e784d0008f5c641132969ed51.tar.gz | |
QPID-6063: [Java Broker] Address review comments from Oleksandr Rudyy <orudyy@apache.org>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1622162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/src/test')
| -rw-r--r-- | qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java index 31af574ee5..7cfc28ffb2 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeOperationalLoggingTest.java @@ -24,6 +24,7 @@ import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.*; import java.util.Collections; +import java.util.EnumSet; import java.util.Map; import org.apache.qpid.server.logging.EventLogger; @@ -264,7 +265,7 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends QpidTestCase // close remote node node2.close(); - waitForNodeDetachedField(remoteNode, true); + waitForRemoteNodeToAttainRole(remoteNode, EnumSet.of(NodeRole.DETACHED)); // verify that remaining node issues the DETACHED operational logging for remote node String expectedMessage = HighAvailabilityMessages.LEFT(node2.getName(), node2.getAddress()).toString(); @@ -296,23 +297,25 @@ public class BDBHAVirtualHostNodeOperationalLoggingTest extends QpidTestCase node2.close(); - waitForNodeDetachedField(remoteNode, true); + waitForRemoteNodeToAttainRole(remoteNode, EnumSet.of(NodeRole.DETACHED)); reset(_eventLogger); - node2Attributes.put(BDBHAVirtualHostNode.PERMITTED_NODES, node1Attributes.get(BDBHAVirtualHostNode.PERMITTED_NODES)); + node2Attributes.put(BDBHAVirtualHostNode.PERMITTED_NODES, + node1Attributes.get(BDBHAVirtualHostNode.PERMITTED_NODES)); node2 = (BDBHAVirtualHostNodeImpl)_helper.recoverHaVHN(node2.getId(), node2Attributes); _helper.assertNodeRole(node2, NodeRole.REPLICA, NodeRole.MASTER); - waitForNodeDetachedField(remoteNode, false); + waitForRemoteNodeToAttainRole(remoteNode, EnumSet.of(NodeRole.REPLICA, NodeRole.MASTER)); final String expectedMessage = HighAvailabilityMessages.JOINED(node2.getName(), node2.getAddress()).toString(); verify(_eventLogger).message(argThat(new LogSubjectMatcher(node1.getGroupLogSubject())), argThat(new LogMessageMatcher(expectedMessage, HighAvailabilityMessages.JOINED_LOG_HIERARCHY))); } - private void waitForNodeDetachedField(BDBHARemoteReplicationNodeImpl remoteNode, boolean expectedDetached) throws InterruptedException { + private void waitForRemoteNodeToAttainRole(BDBHARemoteReplicationNode remoteNode, EnumSet<NodeRole> desiredRoles) throws Exception + { int counter = 0; - while (expectedDetached != remoteNode.isDetached() && counter<50) + while (!desiredRoles.contains(remoteNode.getRole()) && counter<50) { Thread.sleep(100); counter++; |