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

Ensure all resources shut down.

This commit is contained in:
Timothy Bish 2014-08-18 17:58:58 -04:00
parent 3aec42db4f
commit 9b017fdb39
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
View File

@ -17,6 +17,8 @@
package org.apache.activemq.transport.ws; package org.apache.activemq.transport.ws;
import static org.junit.Assert.assertTrue;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
@ -47,8 +49,6 @@ import org.openqa.selenium.firefox.FirefoxProfile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertTrue;
public class WSTransportTest { public class WSTransportTest {
private static final Logger LOG = LoggerFactory.getLogger(WSTransportTest.class); private static final Logger LOG = LoggerFactory.getLogger(WSTransportTest.class);
@ -137,13 +137,21 @@ public class WSTransportTest {
} catch(Exception e) { } catch(Exception e) {
// Some tests explicitly disconnect from stomp so can ignore // Some tests explicitly disconnect from stomp so can ignore
} finally { } finally {
stopBroker(); try {
stopBroker();
} catch (Exception e) {
LOG.warn("Error on Broker stop.");
}
if (driver != null) { if (driver != null) {
driver.quit(); try {
driver.quit();
} catch (Exception e) {}
driver = null; driver = null;
} }
if (server != null) { if (server != null) {
server.stop(); try {
server.stop();
} catch (Exception e) {}
} }
} }
} }
@ -250,6 +258,7 @@ public class WSTransportTest {
assertTrue("Should have disconnected", Wait.waitFor(new Wait.Condition() { assertTrue("Should have disconnected", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception { public boolean isSatisified() throws Exception {
return webStatus.getText().equals("Disconnected"); return webStatus.getText().equals("Disconnected");
} }