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 2014/11/17 16:04:03 UTC
[5/6] qpid-jms git commit: add verification of settlement on transfer
frames
add verification of settlement on transfer frames
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e13dfc48
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e13dfc48
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e13dfc48
Branch: refs/heads/master
Commit: e13dfc4867264d1f17e8dc4af4d1081db62e21ae
Parents: 3c868e7
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Nov 17 13:54:06 2014 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Nov 17 13:54:06 2014 +0000
----------------------------------------------------------------------
.../apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e13dfc48/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 e9aa4ba..c0f2bc2 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
@@ -759,14 +759,25 @@ public class TestAmqpPeer implements AutoCloseable
public void expectTransfer(Matcher<Binary> expectedPayloadMatcher)
{
- expectTransfer(expectedPayloadMatcher, new Accepted(), true);
+ expectTransfer(expectedPayloadMatcher, false, new Accepted(), true);
}
//TODO: fix responseState to only admit applicable types.
- public void expectTransfer(Matcher<Binary> expectedPayloadMatcher, ListDescribedType responseState, boolean responseSettled)
+ public void expectTransfer(Matcher<Binary> expectedPayloadMatcher, boolean settled, ListDescribedType responseState, boolean responseSettled)
{
+ Matcher<Boolean> settledMatcher = null;
+ if(settled)
+ {
+ settledMatcher = equalTo(true);
+ }
+ else
+ {
+ settledMatcher = Matchers.anyOf(equalTo(false), nullValue());
+ }
+
final TransferMatcher transferMatcher = new TransferMatcher();
transferMatcher.setPayloadMatcher(expectedPayloadMatcher);
+ transferMatcher.withSettled(settledMatcher);
final DispositionFrame dispositionResponse = new DispositionFrame()
.setRole(Role.RECEIVER)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org