fix tests failing after previous change, prompted by now encoding values for previously trailing target fields
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/28de1762 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/28de1762 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/28de1762 Branch: refs/heads/master Commit: 28de17620f8056b8c4e2abd59017697d01468ebc Parents: 0422085 Author: Robert Gemmell <[email protected]> Authored: Wed Jan 7 12:08:40 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Wed Jan 7 16:34:47 2015 +0000 ---------------------------------------------------------------------- .../apache/qpid/jms/integration/SessionIntegrationTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/28de1762/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- 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 ebabe4e..1035e04 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 @@ -51,6 +51,7 @@ import org.apache.qpid.jms.provider.amqp.AmqpConnectionProperties; import org.apache.qpid.jms.provider.amqp.AmqpTemporaryDestination; import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.test.testpeer.TestAmqpPeer; +import org.apache.qpid.jms.test.testpeer.basictypes.TerminusDurability; import org.apache.qpid.jms.test.testpeer.describedtypes.Accepted; import org.apache.qpid.jms.test.testpeer.describedtypes.Declare; import org.apache.qpid.jms.test.testpeer.describedtypes.Declared; @@ -416,8 +417,8 @@ public class SessionIntegrationTest extends QpidJmsTestCase { //Expect a link to a topic node, which we will then refuse TargetMatcher targetMatcher = new TargetMatcher(); targetMatcher.withAddress(equalTo(topicName)); - targetMatcher.withDynamic(nullValue());//default = false - targetMatcher.withDurable(nullValue());//default = none/0 + targetMatcher.withDynamic(equalTo(false)); + targetMatcher.withDurable(equalTo(TerminusDurability.NONE)); testPeer.expectSenderAttach(targetMatcher, true, deferAttachResponseWrite); //Expect the detach response to the test peer closing the producer link after refusal. @@ -461,8 +462,8 @@ public class SessionIntegrationTest extends QpidJmsTestCase { //sender link to the given destination, then closing the link after the message is sent. TargetMatcher targetMatcher = new TargetMatcher(); targetMatcher.withAddress(equalTo(topicName)); - targetMatcher.withDynamic(nullValue());//default = false - targetMatcher.withDurable(nullValue());//default = none/0 + targetMatcher.withDynamic(equalTo(false)); + targetMatcher.withDurable(equalTo(TerminusDurability.NONE)); MessageHeaderSectionMatcher headersMatcher = new MessageHeaderSectionMatcher(true); MessageAnnotationsSectionMatcher msgAnnotationsMatcher = new MessageAnnotationsSectionMatcher(true); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
