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

WebSocket SuspendResume updated tests and notes from review

This commit is contained in:
Joakim Erdfelt 2017-06-14 11:14:59 -07:00
parent 7786d0fc2b
commit d02a14eeed
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
View File

@ -913,10 +913,12 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Rem
{
this.upgradeResponse = response;
}
@Override
public SuspendToken suspend()
{
// TODO: limit ability to suspend to only when websocket calls application ?
return connection.suspend();
}

23
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SuspendResumeTest.java
View File

@ -115,7 +115,7 @@ public class SuspendResumeTest
@Test
@Ignore("Not working yet")
public void testSuspendResume() throws Exception
public void testSuspendResume_Bulk() throws Exception
{
List<WebSocketFrame> send = new ArrayList<>();
send.add(new TextFrame().setPayload("echo1"));
@ -154,4 +154,25 @@ public class SuspendResumeTest
session.expect(expect);
}
}
@Test
@Ignore("Not working yet")
public void testSuspendResume_AsFrames() throws Exception
{
List<WebSocketFrame> send = new ArrayList<>();
send.add(new TextFrame().setPayload("echo1"));
send.add(new TextFrame().setPayload("echo2"));
send.add(new CloseFrame());
List<WebSocketFrame> expect = new ArrayList<>();
expect.add(new TextFrame().setPayload("echo1"));
expect.add(new TextFrame().setPayload("echo2"));
expect.add(new CloseFrame());
try (LocalFuzzer session = server.newLocalFuzzer())
{
session.sendFrames(send);
session.expect(expect);
}
}
}