Author: orudyy
Date: Tue Jan 26 12:11:37 2016
New Revision: 1726777
URL: http://svn.apache.org/viewvc?rev=1726777&view=rev
Log:
NO-JIRA: Improve code in test class
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Modified:
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java?rev=1726777&r1=1726776&r2=1726777&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
(original)
+++
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Tue Jan 26 12:11:37 2016
@@ -451,21 +451,25 @@ public class GroupCreator
public void awaitNodeToAttainAttributeValue(int localNodePort, int
remoteNodePort, String attributeName, String... desiredValue) throws Exception
{
final long startTime = System.currentTimeMillis();
- Map<String, Object> data = Collections.emptyMap();
-
List<String> desiredValues = Arrays.asList( desiredValue );
- while(!desiredValues.contains(data.get(attributeName)) &&
(System.currentTimeMillis() - startTime) < 30000)
+ String attributeValue = null;
+ while((System.currentTimeMillis() - startTime) < 30000)
{
LOGGER.debug("Awaiting node '" +
getNodeNameForBrokerPort(remoteNodePort) + "' attribute " +
attributeName + " to have value set to any of " +
desiredValues);
- data = getNodeAttributes(localNodePort, remoteNodePort);
- if (!desiredValue.equals(String.valueOf(data.get(attributeName))))
+ Map<String, Object> data = getNodeAttributes(localNodePort,
remoteNodePort);
+ attributeValue = String.valueOf(data.get(attributeName));
+ if (desiredValues.contains(attributeValue))
+ {
+ break;
+ }
+ else
{
Thread.sleep(1000);
}
}
- LOGGER.debug("Node '" + getNodeNameForBrokerPort(remoteNodePort) + "'
attribute '" + attributeName + "' is " + data.get(attributeName));
- Assert.assertTrue("Unexpected " + attributeName + " at " +
localNodePort, desiredValues.contains(String.valueOf(data.get(attributeName))));
+ LOGGER.debug("Node '" + getNodeNameForBrokerPort(remoteNodePort) + "'
attribute '" + attributeName + "' is " + attributeValue);
+ Assert.assertTrue("Unexpected " + attributeName + " at " +
localNodePort, desiredValues.contains(attributeValue));
}
public RestTestHelper createRestTestHelper(int brokerPort)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
