Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #5774 - make fields and classes in Client/Server ConfigTest static (#5777) 

* Issue #5774 - make fields and classes in Client/Server ConfigTest static

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan 2020-12-10 15:17:02 +11:00 committed by GitHub
parent 0a70fbf206
commit 1753dec720
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConfigTest.java
View File

@ -58,13 +58,12 @@ public class ClientConfigTest
private Server server;
private WebSocketClient client;
private ServerConnector connector;
private final EchoSocket serverSocket = new EchoSocket();
private EchoSocket serverSocket = new EchoSocket();
private static String message = "this message is over 20 characters long";
private final int inputBufferSize = 200;
private final int maxMessageSize = 20;
private final int idleTimeout = 500;
private static final String MESSAGE = "this message is over 20 characters long";
private static final int INPUT_BUFFER_SIZE = 200;
private static final int MAX_MESSAGE_SIZE = 20;
private static final int IDLE_TIMEOUT = 500;
public static Stream<Arguments> data()
{
@ -98,21 +97,21 @@ public class ClientConfigTest
server.stop();
}
@WebSocket(idleTimeout = idleTimeout, maxTextMessageSize = maxMessageSize, maxBinaryMessageSize = maxMessageSize, inputBufferSize = inputBufferSize, batchMode = BatchMode.ON)
public class AnnotatedConfigEndpoint extends EventSocket
@WebSocket(idleTimeout = IDLE_TIMEOUT, maxTextMessageSize = MAX_MESSAGE_SIZE, maxBinaryMessageSize = MAX_MESSAGE_SIZE, inputBufferSize = INPUT_BUFFER_SIZE, batchMode = BatchMode.ON)
public static class AnnotatedConfigEndpoint extends EventSocket
{
}
@WebSocket
public class SessionConfigEndpoint extends EventSocket
public static class SessionConfigEndpoint extends EventSocket
{
@Override
public void onOpen(Session session)
{
session.setIdleTimeout(Duration.ofMillis(idleTimeout));
session.setMaxTextMessageSize(maxMessageSize);
session.setMaxBinaryMessageSize(maxMessageSize);
session.setInputBufferSize(inputBufferSize);
session.setIdleTimeout(Duration.ofMillis(IDLE_TIMEOUT));
session.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
session.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
session.setInputBufferSize(INPUT_BUFFER_SIZE);
super.onOpen(session);
}
}
@ -122,10 +121,10 @@ public class ClientConfigTest
switch (param)
{
case "clientConfig":
client.setInputBufferSize(inputBufferSize);
client.setMaxBinaryMessageSize(maxMessageSize);
client.setIdleTimeout(Duration.ofMillis(idleTimeout));
client.setMaxTextMessageSize(maxMessageSize);
client.setInputBufferSize(INPUT_BUFFER_SIZE);
client.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
client.setIdleTimeout(Duration.ofMillis(IDLE_TIMEOUT));
client.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
return new EventSocket();
case "annotatedConfig":
@ -152,7 +151,7 @@ public class ClientConfigTest
WebSocketCoreSession coreSession = (WebSocketCoreSession)((WebSocketSession)clientEndpoint.session).getCoreSession();
WebSocketConnection connection = coreSession.getConnection();
assertThat(connection.getInputBufferSize(), is(inputBufferSize));
assertThat(connection.getInputBufferSize(), is(INPUT_BUFFER_SIZE));
clientEndpoint.session.close();
assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
@ -171,7 +170,7 @@ public class ClientConfigTest
CompletableFuture<Session> connect = client.connect(clientEndpoint, uri);
connect.get(5, TimeUnit.SECONDS);
clientEndpoint.session.getRemote().sendBytes(BufferUtil.toBuffer(message));
clientEndpoint.session.getRemote().sendBytes(BufferUtil.toBuffer(MESSAGE));
assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(clientEndpoint.error, instanceOf(MessageTooLargeException.class));
@ -190,7 +189,7 @@ public class ClientConfigTest
connect.get(5, TimeUnit.SECONDS);
clientEndpoint.session.getRemote().sendString("hello world");
Thread.sleep(idleTimeout + 500);
Thread.sleep(IDLE_TIMEOUT + 500);
assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(clientEndpoint.error, instanceOf(WebSocketTimeoutException.class));
@ -208,7 +207,7 @@ public class ClientConfigTest
CompletableFuture<Session> connect = client.connect(clientEndpoint, uri);
connect.get(5, TimeUnit.SECONDS);
clientEndpoint.session.getRemote().sendString(message);
clientEndpoint.session.getRemote().sendString(MESSAGE);
assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(clientEndpoint.error, instanceOf(MessageTooLargeException.class));

56
jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerConfigTest.java
View File

@ -63,16 +63,16 @@ public class ServerConfigTest
private Server server;
private WebSocketClient client;
private ServerConnector connector;
private ConnectionListener listener = new ConnectionListener();
private final ConnectionListener listener = new ConnectionListener();
private static String message = "this message is over 20 characters long";
private static final int inputBufferSize = 200;
private static final int maxMessageSize = 20;
private static final int idleTimeout = 500;
private static final String MESSAGE = "this message is over 20 characters long";
private static final int INPUT_BUFFER_SIZE = 200;
private static final int MAX_MESSAGE_SIZE = 20;
private static final int IDLE_TIMEOUT = 500;
private EventSocket annotatedEndpoint = new AnnotatedConfigEndpoint();
private EventSocket sessionConfigEndpoint = new SessionConfigEndpoint();
private EventSocket standardEndpoint = new EventSocket();
private final EventSocket annotatedEndpoint = new AnnotatedConfigEndpoint();
private final EventSocket sessionConfigEndpoint = new SessionConfigEndpoint();
private final EventSocket standardEndpoint = new EventSocket();
private EventSocket getServerEndpoint(String path)
{
@ -95,7 +95,7 @@ public class ServerConfigTest
return Stream.of("servletConfig", "annotatedConfig", "containerConfig", "sessionConfig").map(Arguments::of);
}
@WebSocket(idleTimeout = idleTimeout, maxTextMessageSize = maxMessageSize, maxBinaryMessageSize = maxMessageSize, inputBufferSize = inputBufferSize, batchMode = BatchMode.ON)
@WebSocket(idleTimeout = IDLE_TIMEOUT, maxTextMessageSize = MAX_MESSAGE_SIZE, maxBinaryMessageSize = MAX_MESSAGE_SIZE, inputBufferSize = INPUT_BUFFER_SIZE, batchMode = BatchMode.ON)
public static class AnnotatedConfigEndpoint extends EventSocket
{
}
@ -106,10 +106,10 @@ public class ServerConfigTest
@Override
public void onOpen(Session session)
{
session.setIdleTimeout(Duration.ofMillis(idleTimeout));
session.setMaxTextMessageSize(maxMessageSize);
session.setMaxBinaryMessageSize(maxMessageSize);
session.setInputBufferSize(inputBufferSize);
session.setIdleTimeout(Duration.ofMillis(IDLE_TIMEOUT));
session.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
session.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
session.setInputBufferSize(INPUT_BUFFER_SIZE);
super.onOpen(session);
}
}
@ -119,10 +119,10 @@ public class ServerConfigTest
@Override
public void configure(JettyWebSocketServletFactory factory)
{
factory.setIdleTimeout(Duration.ofMillis(idleTimeout));
factory.setMaxTextMessageSize(maxMessageSize);
factory.setMaxBinaryMessageSize(maxMessageSize);
factory.setInputBufferSize(inputBufferSize);
factory.setIdleTimeout(Duration.ofMillis(IDLE_TIMEOUT));
factory.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
factory.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
factory.setInputBufferSize(INPUT_BUFFER_SIZE);
factory.addMapping("/", (req, resp) -> standardEndpoint);
}
}
@ -145,10 +145,10 @@ public class ServerConfigTest
}
}
public class ConnectionListener implements Connection.Listener
public static class ConnectionListener implements Connection.Listener
{
private AtomicInteger opened = new AtomicInteger(0);
private CountDownLatch closed = new CountDownLatch(1);
private final AtomicInteger opened = new AtomicInteger(0);
private final CountDownLatch closed = new CountDownLatch(1);
@Override
public void onOpened(Connection connection)
@ -188,10 +188,10 @@ public class ServerConfigTest
JettyWebSocketServletContainerInitializer.configure(contextHandler, (context, container) ->
{
container.setIdleTimeout(Duration.ofMillis(idleTimeout));
container.setMaxTextMessageSize(maxMessageSize);
container.setMaxBinaryMessageSize(maxMessageSize);
container.setInputBufferSize(inputBufferSize);
container.setIdleTimeout(Duration.ofMillis(IDLE_TIMEOUT));
container.setMaxTextMessageSize(MAX_MESSAGE_SIZE);
container.setMaxBinaryMessageSize(MAX_MESSAGE_SIZE);
container.setInputBufferSize(INPUT_BUFFER_SIZE);
container.addMapping("/containerConfig", (req, resp) -> standardEndpoint);
});
@ -223,7 +223,7 @@ public class ServerConfigTest
WebSocketCoreSession coreSession = (WebSocketCoreSession)((WebSocketSession)serverEndpoint.session).getCoreSession();
WebSocketConnection connection = coreSession.getConnection();
assertThat(connection.getInputBufferSize(), is(inputBufferSize));
assertThat(connection.getInputBufferSize(), is(INPUT_BUFFER_SIZE));
serverEndpoint.session.close();
assertTrue(serverEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
@ -245,7 +245,7 @@ public class ServerConfigTest
CompletableFuture<Session> connect = client.connect(clientEndpoint, uri);
connect.get(5, TimeUnit.SECONDS);
clientEndpoint.session.getRemote().sendBytes(BufferUtil.toBuffer(message));
clientEndpoint.session.getRemote().sendBytes(BufferUtil.toBuffer(MESSAGE));
assertTrue(serverEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(serverEndpoint.error, instanceOf(MessageTooLargeException.class));
@ -269,7 +269,7 @@ public class ServerConfigTest
clientEndpoint.session.getRemote().sendString("hello world");
String msg = serverEndpoint.textMessages.poll(500, TimeUnit.MILLISECONDS);
assertThat(msg, is("hello world"));
Thread.sleep(idleTimeout + 500);
Thread.sleep(IDLE_TIMEOUT + 500);
assertTrue(serverEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(serverEndpoint.error, instanceOf(WebSocketTimeoutException.class));
@ -290,7 +290,7 @@ public class ServerConfigTest
CompletableFuture<Session> connect = client.connect(clientEndpoint, uri);
connect.get(5, TimeUnit.SECONDS);
clientEndpoint.session.getRemote().sendString(message);
clientEndpoint.session.getRemote().sendString(MESSAGE);
assertTrue(serverEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(serverEndpoint.error, instanceOf(MessageTooLargeException.class));