Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve intermittent failure in this test - do a valid wait check once

This commit is contained in:
gtully 2014-03-18 15:44:37 +00:00
parent 1026dc5a28
commit 47d72dd32a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
activemq-unit-tests/src/test/java/org/apache/activemq/proxy/AMQ4889Test.java
View File

@ -7,6 +7,7 @@ import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.security.AuthenticationUser; import org.apache.activemq.security.AuthenticationUser;
import org.apache.activemq.security.SimpleAuthenticationPlugin; import org.apache.activemq.security.SimpleAuthenticationPlugin;
import org.apache.activemq.util.Wait;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -52,7 +53,7 @@ public class AMQ4889Test {
transportConnector = brokerService.addConnector(LOCAL_URI); transportConnector = brokerService.addConnector(LOCAL_URI);
proxyConnector = new ProxyConnector(); proxyConnector = new ProxyConnector();
proxyConnector.setName("proxy"); // TODO rename proxyConnector.setName("proxy");
proxyConnector.setBind(new URI(PROXY_URI)); proxyConnector.setBind(new URI(PROXY_URI));
proxyConnector.setRemote(new URI(LOCAL_URI)); proxyConnector.setRemote(new URI(LOCAL_URI));
brokerService.addProxyConnector(proxyConnector); brokerService.addProxyConnector(proxyConnector);
@ -91,7 +92,7 @@ public class AMQ4889Test {
try { try {
if (i % 2 == 0) { if (i % 2 == 0) {
LOG.debug("Iteration {} adding bad connection", i); 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); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
fail("createSession should fail"); fail("createSession should fail");
} else { } else {
@ -104,8 +105,14 @@ public class AMQ4889Test {
} catch (JMSSecurityException e) { } catch (JMSSecurityException e) {
} }
LOG.debug("Iteration {} Connections? {}", i, proxyConnector.getConnectionCount()); 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());
} }
} }