From 74916c2fc946d6b83c8ce6f1a6ed591218ac7fa2 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 7 Jul 2020 16:38:51 +1000 Subject: [PATCH] Issue #5018 - add test case for ClientUpgradeRequest timeout Signed-off-by: Lachlan Roberts --- .../tests/client/ClientTimeoutTest.java | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientTimeoutTest.java diff --git a/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientTimeoutTest.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientTimeoutTest.java new file mode 100644 index 000000000000..d18e59ad8ea9 --- /dev/null +++ b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientTimeoutTest.java @@ -0,0 +1,123 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.websocket.tests.client; + +import java.util.EnumSet; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import javax.servlet.DispatcherType; + +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.UpgradeException; +import org.eclipse.jetty.websocket.api.util.WSURI; +import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; +import org.eclipse.jetty.websocket.client.WebSocketClient; +import org.eclipse.jetty.websocket.server.NativeWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter; +import org.eclipse.jetty.websocket.tests.EventSocket; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class ClientTimeoutTest +{ + private Server server; + private WebSocketClient client; + private final CountDownLatch createEndpoint = new CountDownLatch(1); + + @BeforeEach + public void start() throws Exception + { + server = new Server(); + ServerConnector connector = new ServerConnector(server); + server.addConnector(connector); + + ServletContextHandler contextHandler = new ServletContextHandler(); + contextHandler.setContextPath("/"); + server.setHandler(contextHandler); + + NativeWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> + { + container.addMapping("/", (req, res) -> + { + try + { + createEndpoint.await(5, TimeUnit.SECONDS); + return new EventSocket.EchoSocket(); + } + catch (InterruptedException e) + { + throw new IllegalStateException(e); + } + }); + }); + contextHandler.addFilter(WebSocketUpgradeFilter.class, "/", EnumSet.of(DispatcherType.REQUEST)); + server.start(); + + client = new WebSocketClient(); + client.start(); + } + + @AfterEach + public void stop() throws Exception + { + createEndpoint.countDown(); + client.stop(); + server.stop(); + } + + @Test + public void testWebSocketClientTimeout() throws Exception + { + EventSocket clientSocket = new EventSocket(); + long timeout = 1000; + client.setMaxIdleTimeout(timeout); + Future connect = client.connect(clientSocket, WSURI.toWebsocket(server.getURI())); + + ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout + 200, TimeUnit.MILLISECONDS)); + assertThat(executionException.getCause(), instanceOf(UpgradeException.class)); + UpgradeException upgradeException = (UpgradeException)executionException.getCause(); + assertThat(upgradeException.getCause(), instanceOf(TimeoutException.class)); + } + + @Test + public void testClientUpgradeRequestTimeout() throws Exception + { + EventSocket clientSocket = new EventSocket(); + long timeout = 1000; + ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest(); + upgradeRequest.timeout(timeout, TimeUnit.MILLISECONDS); + Future connect = client.connect(clientSocket, WSURI.toWebsocket(server.getURI()), upgradeRequest); + + ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout + 200, TimeUnit.MILLISECONDS)); + assertThat(executionException.getCause(), instanceOf(UpgradeException.class)); + UpgradeException upgradeException = (UpgradeException)executionException.getCause(); + assertThat(upgradeException.getCause(), instanceOf(TimeoutException.class)); + } +}