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

apply patch for: https://issues.apache.org/jira/browse/AMQ-4270 thanks! 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438029 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2013-01-24 14:50:24 +00:00
parent d0a06160e0
commit 9fece8f3bc
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
activemq-core/src/test/java/org/apache/activemq/network/BrokerNetworkWithStuckMessagesTest.java
View File

@ -16,6 +16,10 @@
*/
package org.apache.activemq.network;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@ -36,8 +40,6 @@ import javax.jms.QueueBrowser;
import javax.jms.Session;
import javax.management.ObjectName;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTestSupport;
@ -63,6 +65,9 @@ import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.util.Wait;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -72,7 +77,7 @@ import org.slf4j.LoggerFactory;
* and connectors are created. Also, this test asserts message counts via JMX on
* each broker.
*/
public class BrokerNetworkWithStuckMessagesTest extends TestCase /*NetworkTestSupport*/ {
public class BrokerNetworkWithStuckMessagesTest {
private static final Logger LOG = LoggerFactory.getLogger(BrokerNetworkWithStuckMessagesTest.class);
@ -94,8 +99,8 @@ public class BrokerNetworkWithStuckMessagesTest extends TestCase /*NetworkTestSu
protected String amqDomain = "org.apache.activemq";
@Override
protected void setUp() throws Exception {
@Before
public void setUp() throws Exception {
// For those who want visual confirmation:
// Uncomment the following to enable JMX support on a port number to use
@ -131,7 +136,6 @@ public class BrokerNetworkWithStuckMessagesTest extends TestCase /*NetworkTestSu
bridge.start();
waitForBridgeFormation();
}
protected void waitForBridgeFormation() throws Exception {
@ -147,13 +151,14 @@ public class BrokerNetworkWithStuckMessagesTest extends TestCase /*NetworkTestSu
}
}
@Override
protected void tearDown() throws Exception {
@After
public void tearDown() throws Exception {
bridge.stop();
localBroker.stop();
remoteBroker.stop();
}
@Test(timeout=120000)
public void testBrokerNetworkWithStuckMessages() throws Exception {
int sendNumMessages = 10;
@ -181,7 +186,6 @@ public class BrokerNetworkWithStuckMessagesTest extends TestCase /*NetworkTestSu
Object[] messages = browseQueueWithJmx(localBroker);
assertEquals(sendNumMessages, messages.length);
// Create a synchronous consumer on the remote broker
StubConnection connection2 = createRemoteConnection();
ConnectionInfo connectionInfo2 = createConnectionInfo();