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

Issue #5018 - rename ClientUpgradeRequest timeout to setTimeout 

and increase timeouts used for testing

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-07-07 22:05:01 +10:00
parent 74916c2fc9
commit 702a48c2d1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientTimeoutTest.java
View File

@ -100,7 +100,7 @@ public class ClientTimeoutTest
client.setMaxIdleTimeout(timeout);
Future<Session> connect = client.connect(clientSocket, WSURI.toWebsocket(server.getURI()));
ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout + 200, TimeUnit.MILLISECONDS));
ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout * 2, TimeUnit.MILLISECONDS));
assertThat(executionException.getCause(), instanceOf(UpgradeException.class));
UpgradeException upgradeException = (UpgradeException)executionException.getCause();
assertThat(upgradeException.getCause(), instanceOf(TimeoutException.class));
@ -112,10 +112,10 @@ public class ClientTimeoutTest
EventSocket clientSocket = new EventSocket();
long timeout = 1000;
ClientUpgradeRequest upgradeRequest = new ClientUpgradeRequest();
upgradeRequest.timeout(timeout, TimeUnit.MILLISECONDS);
upgradeRequest.setTimeout(timeout, TimeUnit.MILLISECONDS);
Future<Session> connect = client.connect(clientSocket, WSURI.toWebsocket(server.getURI()), upgradeRequest);
ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout + 200, TimeUnit.MILLISECONDS));
ExecutionException executionException = assertThrows(ExecutionException.class, () -> connect.get(timeout * 2, TimeUnit.MILLISECONDS));
assertThat(executionException.getCause(), instanceOf(UpgradeException.class));
UpgradeException upgradeException = (UpgradeException)executionException.getCause();
assertThat(upgradeException.getCause(), instanceOf(TimeoutException.class));

4
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
View File

@ -185,12 +185,10 @@ public class ClientUpgradeRequest extends UpgradeRequestAdapter
* @param timeout the total timeout for the request/response conversation of the WebSocket handshake;
* use zero or a negative value to disable the timeout
* @param unit the timeout unit
* @return this request object
*/
public ClientUpgradeRequest timeout(long timeout, TimeUnit unit)
public void setTimeout(long timeout, TimeUnit unit)
{
this.timeout = unit.toMillis(timeout);
return this;
}
/**