You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/04/26 16:27:50 UTC
qpid-jms git commit: QPIDJMS-384: move assertion so race is actually
fixed in the other test, add missing equivalent in original test
Repository: qpid-jms
Updated Branches:
refs/heads/master 0df279d96 -> 8b2feac71
QPIDJMS-384: move assertion so race is actually fixed in the other test, add missing equivalent in original test
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8b2feac7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8b2feac7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8b2feac7
Branch: refs/heads/master
Commit: 8b2feac712c1d41dbf4297b5d8ee42c63db786fa
Parents: 0df279d
Author: Robbie Gemmell <ro...@apache.org>
Authored: Thu Apr 26 17:26:58 2018 +0100
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Thu Apr 26 17:26:58 2018 +0100
----------------------------------------------------------------------
.../apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java | 2 +-
.../org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8b2feac7/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java
index 500f19b..8cbbad8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpToMockServerTest.java
@@ -320,10 +320,10 @@ public class NettyTcpToMockServerTest extends QpidJmsTestCase {
connection = cf.createConnection();
connection.start();
- assertNotNull(server.getHandshakeComplete());
assertTrue("HandshakeCompletion not set within given time", server.awaitHandshakeCompletion(2000));
HandshakeComplete handshake = server.getHandshakeComplete();
+ assertNotNull("completion should not be null", handshake);
HttpHeaders requestHeaders = handshake.requestHeaders();
assertTrue(requestHeaders.contains("test-header1"));
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8b2feac7/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java
index b1ccc0e..5c33547 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java
@@ -369,6 +369,7 @@ public class NettyWsTransportTest extends NettyTcpTransportTest {
assertTrue("HandshakeCompletion not set within given time", server.awaitHandshakeCompletion(2000));
HandshakeComplete handshake = server.getHandshakeComplete();
+ assertNotNull("completion should not be null", handshake);
HttpHeaders requestHeaders = handshake.requestHeaders();
assertTrue(requestHeaders.contains("test-header1"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org