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 2019/04/03 15:21:18 UTC
[qpid-jms] branch master updated: QPIDJMS-451: add some additional
CLIENT_ACK session recovery testing
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/master by this push:
new 253ae12 QPIDJMS-451: add some additional CLIENT_ACK session recovery testing
253ae12 is described below
commit 253ae123536c231103dadab405b3fdeca1e63e97
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Apr 3 16:17:42 2019 +0100
QPIDJMS-451: add some additional CLIENT_ACK session recovery testing
---
.../jms/integration/SessionIntegrationTest.java | 57 ++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index 70871fc..6ca6fc5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -77,6 +77,7 @@ import org.apache.qpid.jms.test.testpeer.describedtypes.sections.AmqpValueDescri
import org.apache.qpid.jms.test.testpeer.describedtypes.sections.HeaderDescribedType;
import org.apache.qpid.jms.test.testpeer.matchers.AcceptedMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.ModifiedMatcher;
+import org.apache.qpid.jms.test.testpeer.matchers.ReleasedMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.SourceMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.TargetMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.TransactionalStateMatcher;
@@ -2212,4 +2213,60 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
completed.countDown();
}
}
+
+ @Test(timeout = 20000)
+ public void testRecoveredClientAckSessionWithDurableSubscriber() throws Exception {
+ try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
+ Connection connection = testFixture.establishConnecton(testPeer, false, "?jms.clientID=myClientId", null, null, false);
+ connection.start();
+
+ testPeer.expectBegin();
+
+ Session session = connection.createSession(Session.CLIENT_ACKNOWLEDGE);
+
+ String subscriptionName = "mySubName";
+ String topicName = "myTopic";
+ Topic topic = session.createTopic(topicName);
+
+ int msgCount = 3;
+ testPeer.expectDurableSubscriberAttach(topicName, subscriptionName);
+ testPeer.expectLinkFlowRespondWithTransfer(null, null, null, null, new AmqpValueDescribedType("content"), msgCount, false, false,
+ Matchers.greaterThanOrEqualTo(UnsignedInteger.valueOf(msgCount)), 1, false, true);
+
+ MessageConsumer subscriber = session.createDurableConsumer(topic, subscriptionName);
+
+ TextMessage receivedTextMessage = null;
+ assertNotNull("Expected a message", receivedTextMessage = (TextMessage) subscriber.receive(3000));
+ assertEquals("Unexpected delivery number", 1, receivedTextMessage.getIntProperty(TestAmqpPeer.MESSAGE_NUMBER) + 1);
+ assertNotNull("Expected a message", receivedTextMessage = (TextMessage) subscriber.receive(3000));
+ assertEquals("Unexpected delivery number", 2, receivedTextMessage.getIntProperty(TestAmqpPeer.MESSAGE_NUMBER) + 1);
+
+ session.recover();
+
+ assertNotNull("Expected a message", receivedTextMessage = (TextMessage) subscriber.receive(3000));
+ int deliveryNumber = receivedTextMessage.getIntProperty(TestAmqpPeer.MESSAGE_NUMBER) + 1;
+ assertEquals("Unexpected delivery number", 1, deliveryNumber);
+
+ testPeer.expectDisposition(true, new AcceptedMatcher(), 1, 1);
+
+ receivedTextMessage.acknowledge();
+
+ testPeer.expectDetach(false, true, false);
+ testPeer.expectDisposition(true, new ModifiedMatcher().withDeliveryFailed(equalTo(true)), 2, 2);
+ testPeer.expectDisposition(true, new ReleasedMatcher(), 3, 3);
+
+ subscriber.close();
+
+ testPeer.waitForAllHandlersToComplete(1000);
+
+ testPeer.expectDurableSubUnsubscribeNullSourceLookup(false, false, subscriptionName, topicName, true);
+ testPeer.expectDetach(true, true, true);
+
+ session.unsubscribe(subscriptionName);
+
+ testPeer.expectClose();
+
+ connection.close();
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org