add support for offering capabilities from test peer
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/428c782b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/428c782b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/428c782b Branch: refs/heads/master Commit: 428c782b7d19272ef97e7052520fa480e3099e6e Parents: 3743acf Author: Robert Gemmell <[email protected]> Authored: Tue Nov 18 16:59:57 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Nov 18 16:59:57 2014 +0000 ---------------------------------------------------------------------- .../qpid/jms/integration/IntegrationTestFixture.java | 13 +++++++++++-- .../apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 11 +++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/428c782b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IntegrationTestFixture.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IntegrationTestFixture.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IntegrationTestFixture.java index 4029bf4..6dd0244 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IntegrationTestFixture.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IntegrationTestFixture.java @@ -26,16 +26,25 @@ import javax.jms.JMSException; import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.test.testpeer.TestAmqpPeer; +import org.apache.qpid.proton.amqp.Symbol; public class IntegrationTestFixture { static final int PORT = 25672; Connection establishConnecton(TestAmqpPeer testPeer) throws JMSException { - return establishConnecton(testPeer, null); + return establishConnecton(testPeer, null, null); } Connection establishConnecton(TestAmqpPeer testPeer, String optionsString) throws JMSException { - testPeer.expectPlainConnect("guest", "guest", true); + return establishConnecton(testPeer, optionsString, null); + } + + Connection establishConnecton(TestAmqpPeer testPeer, Symbol[] serverCapabilities) throws JMSException { + return establishConnecton(testPeer, null, serverCapabilities); + } + + Connection establishConnecton(TestAmqpPeer testPeer, String optionsString, Symbol[] serverCapabilities) throws JMSException { + testPeer.expectPlainConnect("guest", "guest", serverCapabilities); // Each connection creates a session for managing temporary destinations etc testPeer.expectBegin(true); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/428c782b/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 cfefe74..33ba9c7 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 @@ -312,7 +312,7 @@ public class TestAmqpPeer implements AutoCloseable null))); } - public void expectPlainConnect(String username, String password, boolean authorize) + public void expectPlainConnect(String username, String password, Symbol[] serverCapabilities) { SaslMechanismsFrame saslMechanismsFrame = new SaslMechanismsFrame().setSaslServerMechanisms(Symbol.valueOf("PLAIN")); addHandler(new HeaderHandlerImpl(AmqpHeader.SASL_HEADER, AmqpHeader.SASL_HEADER, @@ -345,11 +345,18 @@ public class TestAmqpPeer implements AutoCloseable addHandler(new HeaderHandlerImpl(AmqpHeader.HEADER, AmqpHeader.HEADER)); + OpenFrame open = new OpenFrame(); + open.setContainerId("test-amqp-peer-container-id"); + if(serverCapabilities != null) + { + open.setOfferedCapabilities(serverCapabilities); + } + addHandler(new OpenMatcher() .withContainerId(notNullValue(String.class)) .onSuccess(new FrameSender( this, FrameType.AMQP, 0, - new OpenFrame().setContainerId("test-amqp-peer-container-id"), + open, null))); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
