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

Improve test failure on truncated Draft0 handshake read. 

+ If a truncated response occurs, attempt to have the test case produce
  a meaningful response message indicating where/how the truncation
  occured, instead of just a 'read timeout'.
This commit is contained in:
Joakim Erdfelt 2012-02-13 11:46:20 -07:00
parent e7608eafae
commit 4caf662182
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
View File

@ -56,7 +56,7 @@ public class SafariD00
/** /**
* Open the Socket to the destination endpoint and * Open the Socket to the destination endpoint and
* *
* @return the open java Socket. * @return the open java Socket.
* @throws IOException * @throws IOException
*/ */
@ -75,7 +75,7 @@ public class SafariD00
/** /**
* Issue an Http websocket (Draft-0) upgrade request (using an example request captured from OSX/Safari) * Issue an Http websocket (Draft-0) upgrade request (using an example request captured from OSX/Safari)
* *
* @throws UnsupportedEncodingException * @throws UnsupportedEncodingException
*/ */
public void issueHandshake() throws IOException public void issueHandshake() throws IOException
@ -125,11 +125,19 @@ public class SafariD00
// Read expected handshake hixie bytes // Read expected handshake hixie bytes
byte hixieHandshakeExpected[] = TypeUtil.fromHexString("c7438d956cf611a6af70603e6fa54809"); byte hixieHandshakeExpected[] = TypeUtil.fromHexString("c7438d956cf611a6af70603e6fa54809");
byte hixieHandshake[] = new byte[hixieHandshakeExpected.length]; byte hixieHandshake[] = new byte[hixieHandshakeExpected.length];
Assert.assertThat("Hixie handshake buffer size", hixieHandshake.length, is(16)); Assert.assertThat("Hixie handshake buffer size",hixieHandshake.length,is(16));
LOG.debug("Reading hixie handshake bytes"); LOG.debug("Reading hixie handshake bytes");
int readLen = in.read(hixieHandshake,0,hixieHandshake.length); int bytesRead = 0;
Assert.assertThat("Read hixie handshake bytes",readLen,is(hixieHandshake.length)); while (bytesRead < hixieHandshake.length)
{
int val = in.read();
if (val >= 0)
{
hixieHandshake[bytesRead++] = (byte)val;
}
}
Assert.assertThat("Read hixie handshake bytes",bytesRead,is(hixieHandshake.length));
} }
public void sendMessage(String... msgs) throws IOException public void sendMessage(String... msgs) throws IOException