You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/06/21 14:04:09 UTC
qpid-broker-j git commit: QPID-7820: Address review comments from
Alex Rudyy
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 95ee1329c -> 7826a7fc5
QPID-7820: Address review comments from Alex Rudyy <or...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/7826a7fc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7826a7fc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7826a7fc
Branch: refs/heads/master
Commit: 7826a7fc5d9c35059e43e4034424f3b12bd1c825
Parents: 95ee132
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jun 21 14:53:57 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Jun 21 14:56:08 2017 +0100
----------------------------------------------------------------------
.../org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java | 1 +
.../protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java | 6 ++++++
.../tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java | 6 ++++++
.../extensions/websocket/WebSocketFrameTransport.java | 4 ++--
.../v1_0/extensions/websocket/WebSocketTest.java | 11 ++++++++++-
5 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7826a7fc/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
index c03dda3..261543f 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/BrokerAdmin.java
@@ -47,6 +47,7 @@ public interface BrokerAdmin extends Pluggable
boolean isSASLSupported();
boolean isSASLMechanismSupported(String mechanismName);
+ boolean isWebSocketSupported();
String getValidUsername();
String getValidPassword();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7826a7fc/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
index 5c78c86..2680246 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/EmbeddedBrokerPerClassAdminImpl.java
@@ -342,6 +342,12 @@ public class EmbeddedBrokerPerClassAdminImpl implements BrokerAdmin
}
@Override
+ public boolean isWebSocketSupported()
+ {
+ return true;
+ }
+
+ @Override
public String getValidUsername()
{
return "guest";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7826a7fc/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
index f714e93..045df9b 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/ExternalQpidBrokerAdminImpl.java
@@ -113,6 +113,12 @@ public class ExternalQpidBrokerAdminImpl implements BrokerAdmin
}
@Override
+ public boolean isWebSocketSupported()
+ {
+ return true;
+ }
+
+ @Override
public boolean isSASLMechanismSupported(final String mechanismName)
{
return true;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7826a7fc/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java
index 00150ba..fb6b169 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java
@@ -65,7 +65,7 @@ public class WebSocketFrameTransport extends FrameTransport
getBrokerAddress().getPort()));
_webSocketClientHandler = new WebSocketClientHandler(
WebSocketClientHandshakerFactory.newHandshaker(
- uri, WebSocketVersion.V13, "amqp", false, new DefaultHttpHeaders()), uri);
+ uri, WebSocketVersion.V13, "amqp", false, new DefaultHttpHeaders()));
}
@Override
@@ -170,7 +170,7 @@ public class WebSocketFrameTransport extends FrameTransport
private final WebSocketClientHandshaker _handshaker;
private ChannelPromise _handshakeFuture;
- WebSocketClientHandler(final WebSocketClientHandshaker handshaker, final URI uri)
+ WebSocketClientHandler(final WebSocketClientHandshaker handshaker)
{
_handshaker = handshaker;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7826a7fc/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java
index 9ae1f9f..41b2dc3 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java
@@ -28,10 +28,12 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
+import org.junit.Before;
import org.junit.Test;
import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
@@ -45,9 +47,14 @@ import org.apache.qpid.tests.protocol.v1_0.SpecificationTest;
public class WebSocketTest extends ProtocolTestBase
{
-
public static final byte[] AMQP_HEADER = "AMQP\0\1\0\0".getBytes(StandardCharsets.UTF_8);
+ @Before
+ public void setUp()
+ {
+ assumeThat("Broker support for AMQP over websockets is required", getBrokerAdmin().isWebSocketSupported(), is(true));
+ }
+
@Test
@SpecificationTest(section = "2.1", description = "Opening a WebSocket Connection")
public void protocolHeader() throws Exception
@@ -86,6 +93,8 @@ public class WebSocketTest extends ProtocolTestBase
@SpecificationTest(section = "2.1", description = "Opening a WebSocket Connection")
public void successfulOpen() throws Exception
{
+ assumeThat(getBrokerAdmin().isWebSocketSupported(), is(true));
+
final InetSocketAddress addr = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.ANONYMOUS_AMQPWS);
try (FrameTransport transport = new WebSocketFrameTransport(addr).connect())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org