You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/12/08 19:02:37 UTC
svn commit: r1043556 - in /activemq/trunk/activemq-optional/src/test:
java/org/apache/activemq/bugs/AMQ2764Test.java
resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
Author: dejanb
Date: Wed Dec 8 18:02:36 2010
New Revision: 1043556
URL: http://svn.apache.org/viewvc?rev=1043556&view=rev
Log:
more testing of http inactivity monitor
Modified:
activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
Modified: activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java?rev=1043556&r1=1043555&r2=1043556&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java (original)
+++ activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java Wed Dec 8 18:02:36 2010
@@ -22,13 +22,7 @@ import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import javax.jms.*;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -50,6 +44,48 @@ public class AMQ2764Test extends TestCas
private Destination destination;
private ArrayList<Connection> connections = new ArrayList<Connection>();
+ public void testInactivityMonitor() throws Exception {
+
+ startBrokerTwo();
+ brokerTwo.waitUntilStarted();
+
+ startBrokerOne();
+ brokerOne.waitUntilStarted();
+
+ Thread.sleep(2000);
+
+ ActiveMQConnectionFactory secondProducerConnectionFactory = createBrokerTwoHttpConnectionFactory();
+ ActiveMQConnectionFactory consumerConnectionFactory = createBrokerOneHttpConnectionFactory();
+
+ MessageConsumer consumer = createConsumer(consumerConnectionFactory);
+ AtomicInteger counter = createConsumerCounter(consumerConnectionFactory);
+ waitForConsumerToArrive(counter);
+
+ Connection connection = secondProducerConnectionFactory.createConnection();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = session.createProducer(destination);
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+
+ final int expectedMessagesReceived = 2000;
+
+ for (int i = 0; i < expectedMessagesReceived; i++) {
+ Message message = session.createMessage();
+ producer.send(message);
+ LOG.info("sent message " + i);
+ }
+
+ for (int i = 0; i < expectedMessagesReceived; i++) {
+ Message message = consumer.receive(2000);
+ if (message == null) {
+ fail("Didn't receive a message");
+ }
+ LOG.info("received message " + i);
+ }
+
+
+ }
+
public void testBrokerRestart() throws Exception {
startBrokerTwo();
@@ -141,6 +177,14 @@ public class AMQ2764Test extends TestCas
return new ActiveMQConnectionFactory("vm://broker2");
}
+ protected ActiveMQConnectionFactory createBrokerOneHttpConnectionFactory() {
+ return new ActiveMQConnectionFactory("http://localhost:61616");
+ }
+
+ protected ActiveMQConnectionFactory createBrokerTwoHttpConnectionFactory() {
+ return new ActiveMQConnectionFactory("http://localhost:61617");
+ }
+
protected void setUp() throws Exception {
LOG.info("===============================================================================");
Modified: activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml?rev=1043556&r1=1043555&r2=1043556&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml (original)
+++ activemq/trunk/activemq-optional/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml Wed Dec 8 18:02:36 2010
@@ -29,6 +29,7 @@
<!-- configure a low inactivity monitor check time to ensure all messages are received quickly, ask for a response as
peer will have 30 second inactivity delay so won't satisfy our read check till 30+ delay -->
<transportConnector uri="http://localhost:61617?transport.readCheckTime=4000&transport.initialDelayTime=4000&transport.keepAliveResponseRequired=true"/>
+ <!--<transportConnector uri="http://localhost:61617"/>-->
</transportConnectors>
</broker>