enhance disposition matching ability to allow for transactional state
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/3c868e70 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/3c868e70 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/3c868e70 Branch: refs/heads/master Commit: 3c868e70a31ac22e8526895ffa8114d3224c7803 Parents: fe8768b Author: Robert Gemmell <[email protected]> Authored: Mon Nov 17 12:06:35 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Mon Nov 17 12:06:35 2014 +0000 ---------------------------------------------------------------------- .../qpid/jms/test/testpeer/TestAmqpPeer.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/3c868e70/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 fb9e1b4..e9aa4ba 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 @@ -791,9 +791,24 @@ public class TestAmqpPeer implements AutoCloseable public void expectDispositionThatIsAcceptedAndSettled() { + expectDisposition(true, new DescriptorMatcher(Accepted.DESCRIPTOR_CODE, Accepted.DESCRIPTOR_SYMBOL)); + } + + public void expectDisposition(boolean settled, Matcher<?> stateMatcher) + { + Matcher<Boolean> settledMatcher = null; + if(settled) + { + settledMatcher = equalTo(true); + } + else + { + settledMatcher = Matchers.anyOf(equalTo(false), nullValue()); + } + addHandler(new DispositionMatcher() - .withSettled(equalTo(true)) - .withState(new DescriptorMatcher(Accepted.DESCRIPTOR_CODE, Accepted.DESCRIPTOR_SYMBOL))); + .withSettled(settledMatcher) + .withState(stateMatcher)); } private Target createTargetObjectFromDescribedType(Object o) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
