Author: kwall
Date: Thu Oct 18 08:12:21 2012
New Revision: 1399547
URL: http://svn.apache.org/viewvc?rev=1399547&view=rev
Log:
QPID-4298: AMQQueueDeferredOrderingTest should sync after sending the test
messages
* Call AMQSession#sync after the sending of each (non-transactional) message,
this is required to avoid spurious
test fails on machines that are CPU starved.
* Renamed test from testPausedOrder to
testMessagesSentByTwoThreadsAreDeliveredInOrder to better reflect the
nature of the test.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=1399547&r1=1399546&r2=1399547&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
Thu Oct 18 08:12:21 2012
@@ -27,7 +27,6 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import javax.jms.Connection;
-import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -72,10 +71,11 @@ public class AMQQueueDeferredOrderingTes
for (int i = start; i < end && !interrupted(); i++)
{
producer.send(session.createTextMessage(Integer.toString(i)));
+ ((AMQSession<?, ?>)session).sync();
}
this._logger.info("Sent " + (end - start) + " messages");
}
- catch (JMSException e)
+ catch (Exception e)
{
throw new RuntimeException(e);
}
@@ -101,7 +101,7 @@ public class AMQQueueDeferredOrderingTes
con.start();
}
- public void testPausedOrder() throws Exception
+ public void testMessagesSentByTwoThreadsAreDeliveredInOrder() throws
Exception
{
// Setup initial messages
@@ -121,9 +121,9 @@ public class AMQQueueDeferredOrderingTes
for (int i = 0; i < numMessages; i++)
{
Message msg = consumer.receive(3000);
- assertNotNull("Message should not be null", msg);
- assertTrue("Message should be a text message", msg instanceof
TextMessage);
- assertEquals("Message content does not match expected",
Integer.toString(i), ((TextMessage) msg).getText());
+ assertNotNull("Message " + i + " should not be null", msg);
+ assertTrue("Message " + i + " should be a text message", msg
instanceof TextMessage);
+ assertEquals("Message content " + i + "does not match expected",
Integer.toString(i), ((TextMessage) msg).getText());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
