Repository: activemq Updated Branches: refs/heads/trunk 1026dc5a2 -> 47d72dd32
resolve intermittent failure in this test - do a valid wait check once Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/47d72dd3 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/47d72dd3 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/47d72dd3 Branch: refs/heads/trunk Commit: 47d72dd32a40059d121ecc33f892d38065f99c71 Parents: 1026dc5 Author: gtully <[email protected]> Authored: Tue Mar 18 15:44:37 2014 +0000 Committer: gtully <[email protected]> Committed: Tue Mar 18 15:45:26 2014 +0000 ---------------------------------------------------------------------- .../java/org/apache/activemq/proxy/AMQ4889Test.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/47d72dd3/activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java index bfe73ec..351f2d7 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java @@ -7,6 +7,7 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.security.AuthenticationUser; import org.apache.activemq.security.SimpleAuthenticationPlugin; +import org.apache.activemq.util.Wait; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,7 +53,7 @@ public class AMQ4889Test { transportConnector = brokerService.addConnector(LOCAL_URI); proxyConnector = new ProxyConnector(); - proxyConnector.setName("proxy"); // TODO rename + proxyConnector.setName("proxy"); proxyConnector.setBind(new URI(PROXY_URI)); proxyConnector.setRemote(new URI(LOCAL_URI)); brokerService.addProxyConnector(proxyConnector); @@ -91,7 +92,7 @@ public class AMQ4889Test { try { if (i % 2 == 0) { LOG.debug("Iteration {} adding bad connection", i); - Connection connection = connectionFactory.createConnection(USER, WRONG_PASSWORD); // TODO change to debug + Connection connection = connectionFactory.createConnection(USER, WRONG_PASSWORD); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); fail("createSession should fail"); } else { @@ -104,8 +105,14 @@ public class AMQ4889Test { } catch (JMSSecurityException e) { } LOG.debug("Iteration {} Connections? {}", i, proxyConnector.getConnectionCount()); - Thread.sleep(50); // Need to wait for remove to finish - assertEquals(expectedConnectionCount, proxyConnector.getConnectionCount()); } + final Integer val = expectedConnectionCount; + Wait.waitFor(new Wait.Condition() { + @Override + public boolean isSatisified() throws Exception { + return val.equals(proxyConnector.getConnectionCount()); + } + }, 20); + assertEquals(val, proxyConnector.getConnectionCount()); } }
