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

Cleanup in ConnectTest to do two things: 

1) connect/disconnect 500 (which still seems high) times instead of as many as possible in 25seconds.  On fast machines, this is MUCH faster.
2) Actually call Thead.start(), not Thread.run() in cases where it should be on a background thread.
This commit is contained in:
Daniel Kulp 2014-07-10 15:28:43 -04:00
parent a498bffdd1
commit 7fe431b21f
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
View File

@ -29,9 +29,11 @@ import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.security.JaasDualAuthenticationPlugin;
import org.apache.activemq.util.Wait;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -62,11 +64,9 @@ public class ConnectTest {
brokerService.addConnector("stomp://0.0.0.0:0?transport.soLinger=0");
brokerService.start();
Thread t1 = new Thread() {
StompConnection connection = new StompConnection();
@Override
public void run() {
//test 500 connect/disconnects
for (int x = 0; x < 500; x++) {
try {
connection.open("localhost", brokerService.getTransportConnectors().get(0).getConnectUri().getPort());
connection.connect("system", "manager");
@ -76,16 +76,6 @@ public class ConnectTest {
exceptions.add(ex);
}
}
};
int i = 0;
long done = System.currentTimeMillis() + (15 * 1000);
while (System.currentTimeMillis() < done) {
t1.run();
if (++i % 5000 == 0) {
LOG.info("connection count on stomp connector:" + brokerService.getTransportConnectors().get(0).connectionCount());
}
}
assertTrue("no dangling connections", Wait.waitFor(new Wait.Condition() {
@Override
@ -119,7 +109,7 @@ public class ConnectTest {
}
};
t1.run();
t1.start();
assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
@Override
@ -143,7 +133,7 @@ public class ConnectTest {
@Test
public void testInactivityMonitor() throws Exception {
brokerService.addConnector("stomp://0.0.0.0:0?transport.defaultHeartBeat=5000,0&transport.useKeepAlive=false");
brokerService.addConnector("stomp://0.0.0.0:0?transport.defaultHeartBeat=1000,0&transport.useKeepAlive=false");
brokerService.start();
Thread t1 = new Thread() {
@ -161,7 +151,7 @@ public class ConnectTest {
}
};
t1.run();
t1.start();
assertTrue("one connection", Wait.waitFor(new Wait.Condition() {
@Override