You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/03/15 22:29:28 UTC
qpid-jms git commit: https://issues.apache.org/jira/browse/QPIDJMS-154
Repository: qpid-jms
Updated Branches:
refs/heads/master 15f6446ac -> 274fff802
https://issues.apache.org/jira/browse/QPIDJMS-154
Add more testing for connection state after failure to connect when the
peer sends error info.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/274fff80
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/274fff80
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/274fff80
Branch: refs/heads/master
Commit: 274fff802dfae00f5722ceebbc952362fcbe4e54
Parents: 15f6446
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Mar 15 17:28:56 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Mar 15 17:28:56 2016 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/meta/JmsConsumerInfo.java | 3 +--
.../provider/failover/FailoverIntegrationTest.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/274fff80/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
index 2088825..b653fdd 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/meta/JmsConsumerInfo.java
@@ -18,7 +18,6 @@ package org.apache.qpid.jms.meta;
import org.apache.qpid.jms.JmsDestination;
import org.apache.qpid.jms.JmsRedeliveryPolicy;
-import org.apache.qpid.jms.util.ToStringSupport;
public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsumerInfo> {
@@ -174,7 +173,7 @@ public final class JmsConsumerInfo implements JmsResource, Comparable<JmsConsume
@Override
public String toString() {
- return ToStringSupport.toString(this);
+ return "JmsConsumerInfo: { " + getId() + " }";
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/274fff80/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
index 655e374..a173f18 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java
@@ -93,7 +93,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase {
}
}
- @Test(timeout = 20000)
+ @Test //(timeout = 20000)
public void testFailoverHandlesConnectErrorNotFound() throws Exception {
try (TestAmqpPeer originalPeer = new TestAmqpPeer();
@@ -101,6 +101,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase {
final CountDownLatch finalConnected = new CountDownLatch(1);
final String finalURI = createPeerURI(finalPeer);
+ final DescribedType amqpValueNullContent = new AmqpValueDescribedType(null);
originalPeer.rejectConnect(AmqpError.NOT_FOUND, "Resource could not be located", null);
@@ -126,6 +127,18 @@ public class FailoverIntegrationTest extends QpidJmsTestCase {
assertTrue("Should connect to final peer", finalConnected.await(5, TimeUnit.SECONDS));
+ finalPeer.expectBegin();
+ finalPeer.expectReceiverAttach();
+ finalPeer.expectLinkFlowRespondWithTransfer(null, null, null, null, amqpValueNullContent);
+ finalPeer.expectDispositionThatIsAcceptedAndSettled();
+
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue("myQueue");
+ MessageConsumer consumer = session.createConsumer(queue);
+ Message message = consumer.receive(2000);
+
+ assertNotNull(message);
+
// Shut it down
finalPeer.expectClose();
connection.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org