Repository: qpid-jms Updated Branches: refs/heads/master 8b0993c9b -> dbdfb5b83
update test peer to close rather than detach links when asked Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/dbdfb5b8 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/dbdfb5b8 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/dbdfb5b8 Branch: refs/heads/master Commit: dbdfb5b83a33e4c85ac2759ee97167c81e48acd1 Parents: 3077100 Author: Robert Gemmell <[email protected]> Authored: Fri Oct 3 17:30:39 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Fri Oct 3 17:36:53 2014 +0100 ---------------------------------------------------------------------- .../org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 3 ++- .../qpid/jms/integration/SenderIntegrationTest.java | 2 +- .../org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 12 ++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dbdfb5b8/qpid-jms-client-tmp/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client-tmp/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client-tmp/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index ae18dca..8ab6d79 100644 --- a/qpid-jms-client-tmp/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client-tmp/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -481,7 +481,8 @@ public class TestAmqpPeer implements AutoCloseable final DetachMatcher detachMatcher = new DetachMatcher().withClosed(equalTo(close)); final DetachFrame detachResponse = new DetachFrame() - .setHandle(UnsignedInteger.valueOf(_nextLinkHandle - 1)); // TODO: this needs to be the value used in the attach response + .setHandle(UnsignedInteger.valueOf(_nextLinkHandle - 1)) // TODO: this needs to be the value used in the attach response + .setClosed(close); // The response frame channel will be dynamically set based on the incoming frame. Using the -1 is an illegal placeholder. final FrameSender detachResponseSender = new FrameSender(this, FrameType.AMQP, -1, detachResponse, null); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dbdfb5b8/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java index d1fac47..bff17fa 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SenderIntegrationTest.java @@ -67,7 +67,7 @@ public class SenderIntegrationTest extends QpidJmsTestCase { Queue queue = session.createQueue("myQueue"); MessageProducer producer = session.createProducer(queue); - testPeer.expectDetach(true); + testPeer.expectDetach(true, true); producer.close(); testPeer.waitForAllHandlersToComplete(1000); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/dbdfb5b8/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index a5e6561..a8f367e 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -485,12 +485,16 @@ public class TestAmqpPeer implements AutoCloseable addHandler(attachMatcher); } - public void expectDetach(boolean close) + public void expectDetach(boolean expectClosed, boolean replyClosed) { - final DetachMatcher detachMatcher = new DetachMatcher().withClosed(equalTo(close)); + final DetachMatcher detachMatcher = new DetachMatcher().withClosed(equalTo(expectClosed)); - final DetachFrame detachResponse = new DetachFrame() - .setHandle(UnsignedInteger.valueOf(_nextLinkHandle - 1)); // TODO: this needs to be the value used in the attach response + final DetachFrame detachResponse = new DetachFrame(); + detachResponse.setHandle(UnsignedInteger.valueOf(_nextLinkHandle - 1)); // TODO: this needs to be the value used in the attach response + if(replyClosed) + { + detachResponse.setClosed(replyClosed); + } // The response frame channel will be dynamically set based on the incoming frame. Using the -1 is an illegal placeholder. final FrameSender detachResponseSender = new FrameSender(this, FrameType.AMQP, -1, detachResponse, null); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
