update the testpeer to use the new constants rather than literals
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/de967230 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/de967230 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/de967230 Branch: refs/heads/master Commit: de9672305380bef719f44b49d0a6b644f8750685 Parents: 992460d Author: Robert Gemmell <[email protected]> Authored: Tue Oct 28 12:42:54 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Oct 28 12:42:54 2014 +0000 ---------------------------------------------------------------------- .../org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/de967230/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 094668b..7fd48d7 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 @@ -32,6 +32,8 @@ import java.util.concurrent.TimeUnit; import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport; +import org.apache.qpid.jms.test.testpeer.basictypes.TerminusDurability; +import org.apache.qpid.jms.test.testpeer.basictypes.TerminusExpiryPolicy; import org.apache.qpid.jms.test.testpeer.describedtypes.Accepted; import org.apache.qpid.jms.test.testpeer.describedtypes.AttachFrame; import org.apache.qpid.jms.test.testpeer.describedtypes.BeginFrame; @@ -398,8 +400,8 @@ public class TestAmqpPeer implements AutoCloseable TargetMatcher targetMatcher = new TargetMatcher(); targetMatcher.withAddress(nullValue()); targetMatcher.withDynamic(equalTo(true)); - targetMatcher.withDurable(equalTo(UnsignedInteger.valueOf(0)));//TODO: non-literal values for TerminusDurability etc. - targetMatcher.withExpiryPolicy(equalTo(Symbol.valueOf("link-detach")));//TODO: non-literal values for ExpiryPolicy etc. + targetMatcher.withDurable(equalTo(TerminusDurability.NONE)); + targetMatcher.withExpiryPolicy(equalTo(TerminusExpiryPolicy.LINK_DETACH)); final AttachMatcher attachMatcher = new AttachMatcher() .withName(notNullValue()) @@ -531,8 +533,8 @@ public class TestAmqpPeer implements AutoCloseable sourceMatcher.withAddress(equalTo(topicPrefix + topicName)); sourceMatcher.withDynamic(equalTo(false)); //TODO: will possibly be changed to a 1/config durability - sourceMatcher.withDurable(equalTo(UnsignedInteger.valueOf(2)));//TODO: non-literal values for TerminusDurability etc. - sourceMatcher.withExpiryPolicy(equalTo(Symbol.valueOf("never")));//TODO: non-literal values for ExpiryPolicy etc. + sourceMatcher.withDurable(equalTo(TerminusDurability.UNSETTLED_STATE)); + sourceMatcher.withExpiryPolicy(equalTo(TerminusExpiryPolicy.NEVER)); final AttachMatcher attachMatcher = new AttachMatcher() .withName(equalTo(subscriptionName)) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
