QPID-2243, QPID-3658: update test to fix incorrect assumption that messages have already reached the broker

Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1209430 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 0 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
index 5598dda5de..5f758061d5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
@@ -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 extends QpidBrokerTestCase
             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 extends QpidBrokerTestCase
             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());