You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/01/18 16:43:43 UTC
svn commit: r1779355 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
test-profiles/Java10UninvestigatedTestsExcludes
Author: kwall
Date: Wed Jan 18 16:43:43 2017
New Revision: 1779355
URL: http://svn.apache.org/viewvc?rev=1779355&view=rev
Log:
QPID-7546: [System Tests] Enable RedeliveredMessageTest for AMQP 1.0
Also made test improvements.
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java?rev=1779355&r1=1779354&r2=1779355&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java Wed Jan 18 16:43:43 2017
@@ -30,42 +30,42 @@ import javax.jms.Session;
public class RedeliveredMessageTest extends QpidBrokerTestCase
{
- private Connection _connection;
-
- public void setUp() throws Exception
+ public void testRedeliveredFlagSetAfterRedelivery() throws Exception
{
- super.setUp();
- _connection = getConnection();
- }
-
- public void testRedeliveredFlagOnSessionClose() throws Exception
- {
- Session session = _connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- Destination destination = session.createQueue(getTestQueueName());
+ Connection connection = getConnectionWithPrefetch(0);
+ connection.start();
+ Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
+ Destination destination = createTestQueue(session);
MessageConsumer consumer = session.createConsumer(destination);
final int numberOfMessages = 3;
sendMessage(session, destination, numberOfMessages);
- _connection.start();
+ // Receive only the first message. Leave messages 2 and 3 unseen.
+ receiveAssertingJmsDelivery(consumer, 0, false);
+
+ session.rollback();
+ connection.close();
- for(int i = 0; i < numberOfMessages; i++)
- {
- final Message m = consumer.receive(1000l);
- assertNotNull("Message is not recieved at " + i, m);
- assertFalse("Redelivered should be not set", m.getJMSRedelivered());
- }
-
- session.close();
- session = _connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
- destination = session.createQueue(getTestQueueName());
+ connection = getConnectionWithPrefetch(0);
+ connection.start();
+ session = connection.createSession(true, Session.SESSION_TRANSACTED);
consumer = session.createConsumer(destination);
- for(int i = 0; i < numberOfMessages; i++)
- {
- final Message m = consumer.receive(1000l);
- assertNotNull("Message is not recieved at " + i, m);
- assertTrue("Redelivered should be set", m.getJMSRedelivered());
- }
+ receiveAssertingJmsDelivery(consumer, 0, true);
+ receiveAssertingJmsDelivery(consumer, 1, false);
+ receiveAssertingJmsDelivery(consumer, 2, false);
+
+ }
+
+ private void receiveAssertingJmsDelivery(MessageConsumer consumer,
+ int expectedIndex,
+ boolean expectedJMSRedelivered) throws Exception
+ {
+ Message m = consumer.receive(getReceiveTimeout());
+ assertNotNull("Message is not received" , m);
+ assertEquals("Unexpected message expectedIndex" , expectedIndex, m.getIntProperty(INDEX));
+
+ assertEquals("Redelivered should be not set on message expectedIndex " + expectedIndex, expectedJMSRedelivered, m.getJMSRedelivered());
}
}
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1779355&r1=1779354&r2=1779355&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Wed Jan 18 16:43:43 2017
@@ -24,7 +24,6 @@ org.apache.qpid.server.logging.DurableQu
org.apache.qpid.server.logging.QueueLoggingTest#*
org.apache.qpid.server.logging.TransientQueueLoggingTest#*
org.apache.qpid.client.prefetch.PrefetchBehaviourTest#*
-org.apache.qpid.client.redelivered.RedeliveredMessageTest#*
org.apache.qpid.server.security.acl.ExternalACLTest#*
org.apache.qpid.server.security.acl.ExhaustiveACLTest#*
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org