You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/12/02 12:58:14 UTC
svn commit: r1209430 -
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
Author: robbie
Date: Fri Dec 2 11:58:14 2011
New Revision: 1209430
URL: http://svn.apache.org/viewvc?rev=1209430&view=rev
Log:
QPID-2243, QPID-3658: update test to fix incorrect assumption that messages have already reached the broker
Applied patch from Oleksandr Rudyy<or...@gmail.com> and myself.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java?rev=1209430&r1=1209429&r2=1209430&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java Fri Dec 2 11:58:14 2011
@@ -32,6 +32,8 @@ import javax.jms.TextMessage;
import javax.management.JMException;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.TabularData;
+
+import org.apache.qpid.client.AMQSession;
import org.apache.qpid.management.common.mbeans.ManagedConnection;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -147,6 +149,10 @@ public class ManagedConnectionMBeanTest
producer.send(producerSession.createTextMessage("Test " + i));
}
+ // sync to make sure that messages are received on the broker
+ // before we commit via JMX
+ ((AMQSession<?, ?>) producerSession).sync();
+
Message m = consumer.receive(500l);
assertNull("Unexpected message received", m);
@@ -204,6 +210,10 @@ public class ManagedConnectionMBeanTest
producer.send(producerSession.createTextMessage("Test " + i));
}
+ // sync to make sure that messages are received on the broker
+ // before we rollback via JMX
+ ((AMQSession<?, ?>) producerSession).sync();
+
Number channelId = getFirstTransactedChannelId(mBean, 2);
mBean.rollbackTransactions(channelId.intValue());
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org