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

Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

This commit is contained in:
Jesse McConnell 2012-06-26 11:14:45 -05:00
parent 89a26e6d75 d2056f3eb2
commit 4daa27b1d8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServletRFCTest.java
View File

@ -214,7 +214,7 @@ public class WebSocketServletRFCTest
Assert.assertThat("Response Code",respHeader,startsWith("HTTP/1.1 101 Switching Protocols"));
Assert.assertThat("Response Header Upgrade",respHeader,containsString("Upgrade: WebSocket\r\n"));
// Assert.assertThat("Response Header Connection",respHeader,containsString("Connection: Upgrade\r\n"));
Assert.assertThat("Response Header Connection",respHeader,containsString("Connection: Upgrade\r\n"));
// Generate text frame
TextFrame txt = new TextFrame("CRASH");
@ -225,13 +225,14 @@ public class WebSocketServletRFCTest
BufferUtil.writeTo(txtbuf,out);
// Read frame (hopefully close frame)
ByteBuffer closeFrame = ByteBuffer.allocate(20);
System.out.println("Reading from in");
read(in,closeFrame);
ByteBuffer rbuf = ByteBuffer.allocate(20);
read(in,rbuf);
// Parse Frame
parser.parse(closeFrame);
rbuf.flip();
parser.parse(rbuf);
// Validate responses
capture.assertNoErrors();
capture.assertHasFrame(CloseFrame.class,1);