diff options
Diffstat (limited to 'jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java')
-rw-r--r-- | jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java index 1d6c6c11a6..c2653eda34 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java @@ -18,14 +18,12 @@ package org.eclipse.jetty.websocket.client; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.*; import java.net.InetSocketAddress; import java.net.URI; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.Future; @@ -37,10 +35,11 @@ import org.eclipse.jetty.websocket.api.BatchMode; import org.eclipse.jetty.websocket.api.RemoteEndpoint; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.UpgradeRequest; +import org.eclipse.jetty.websocket.common.WebSocketSession; import org.eclipse.jetty.websocket.common.frames.TextFrame; import org.eclipse.jetty.websocket.common.io.FutureWriteCallback; import org.eclipse.jetty.websocket.common.test.BlockheadServer; -import org.eclipse.jetty.websocket.common.test.BlockheadServer.ServerConnection; +import org.eclipse.jetty.websocket.common.test.IBlockheadServerConnection; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -106,7 +105,7 @@ public class WebSocketClientTest request.setSubProtocols("echo"); Future<Session> future = client.connect(cliSock,wsUri,request); - final ServerConnection srvSock = server.accept(); + final IBlockheadServerConnection srvSock = server.accept(); srvSock.upgrade(); Session sess = future.get(500,TimeUnit.MILLISECONDS); @@ -118,7 +117,8 @@ public class WebSocketClientTest cliSock.assertWasOpened(); cliSock.assertNotClosed(); - Assert.assertThat("client.connectionManager.sessions.size",client.getConnectionManager().getSessions().size(),is(1)); + Collection<WebSocketSession> sessions = client.getBeans(WebSocketSession.class); + Assert.assertThat("client.connectionManager.sessions.size",sessions.size(),is(1)); RemoteEndpoint remote = cliSock.getSession().getRemote(); remote.sendStringByFuture("Hello World!"); @@ -152,7 +152,7 @@ public class WebSocketClientTest request.setSubProtocols("echo"); Future<Session> future = client.connect(cliSock,wsUri,request); - final ServerConnection srvSock = server.accept(); + final IBlockheadServerConnection srvSock = server.accept(); srvSock.upgrade(); Session sess = future.get(500,TimeUnit.MILLISECONDS); @@ -164,7 +164,8 @@ public class WebSocketClientTest cliSock.assertWasOpened(); cliSock.assertNotClosed(); - Assert.assertThat("client.connectionManager.sessions.size",client.getConnectionManager().getSessions().size(),is(1)); + Collection<WebSocketSession> sessions = client.getBeans(WebSocketSession.class); + Assert.assertThat("client.connectionManager.sessions.size",sessions.size(),is(1)); FutureWriteCallback callback = new FutureWriteCallback(); @@ -188,7 +189,7 @@ public class WebSocketClientTest Future<Session> future = client.connect(wsocket,server.getWsUri()); // Server - final ServerConnection srvSock = server.accept(); + final IBlockheadServerConnection srvSock = server.accept(); srvSock.upgrade(); // Validate connect @@ -226,7 +227,7 @@ public class WebSocketClientTest URI wsUri = server.getWsUri(); Future<Session> future = fact.connect(wsocket,wsUri); - ServerConnection ssocket = server.accept(); + IBlockheadServerConnection ssocket = server.accept(); ssocket.upgrade(); future.get(500,TimeUnit.MILLISECONDS); @@ -266,7 +267,7 @@ public class WebSocketClientTest URI wsUri = server.getWsUri(); Future<Session> future = factSmall.connect(wsocket,wsUri); - ServerConnection ssocket = server.accept(); + IBlockheadServerConnection ssocket = server.accept(); ssocket.upgrade(); future.get(500,TimeUnit.MILLISECONDS); @@ -304,7 +305,7 @@ public class WebSocketClientTest URI wsUri = server.getWsUri(); Future<Session> future = client.connect(wsocket,wsUri); - ServerConnection ssocket = server.accept(); + IBlockheadServerConnection ssocket = server.accept(); ssocket.upgrade(); wsocket.awaitConnect(1,TimeUnit.SECONDS); @@ -346,7 +347,7 @@ public class WebSocketClientTest URI wsUri = server.getWsUri().resolve("/test?snack=cashews&amount=handful&brand=off"); Future<Session> future = fact.connect(wsocket,wsUri); - ServerConnection ssocket = server.accept(); + IBlockheadServerConnection ssocket = server.accept(); ssocket.upgrade(); future.get(500,TimeUnit.MILLISECONDS); |