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

Fixing more tests

This commit is contained in:
Joakim Erdfelt 2012-07-06 13:49:47 -07:00
parent 071f15e0c9
commit b39a6a6f59
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java
View File

@ -129,17 +129,24 @@ public class WebSocketEventDriver implements Parser.Listener
{
case CLOSE:
{
if (events.onClose != null)
if (events.onClose == null)
{
byte payload[] = frame.getPayloadData();
int statusCode = CloseUtil.getStatusCode(payload);
String reason = CloseUtil.getReason(payload);
events.onClose.call(websocket,connection,statusCode,reason);
// not interested in close events
return;
}
byte payload[] = frame.getPayloadData();
int statusCode = CloseUtil.getStatusCode(payload);
String reason = CloseUtil.getReason(payload);
events.onClose.call(websocket,connection,statusCode,reason);
return;
}
case BINARY:
{
if (events.onBinary == null)
{
// not interested in binary events
return;
}
if (events.onBinary.isStreaming())
{
boolean needsNotification = false;
@ -205,6 +212,11 @@ public class WebSocketEventDriver implements Parser.Listener
}
case TEXT:
{
if (events.onText == null)
{
// not interested in text events
return;
}
if (events.onText.isStreaming())
{
boolean needsNotification = false;

21
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
View File

@ -316,4 +316,25 @@ public class WebSocketFrame implements Frame
{
this.rsv3 = rsv3;
}
@Override
public String toString()
{
StringBuilder b = new StringBuilder();
if (opcode != null)
{
b.append(opcode.name());
}
else
{
b.append("NO-OP");
}
b.append('[');
b.append("len=").append(getPayloadLength());
b.append(",fin=").append(fin);
b.append(",masked=").append(masked);
b.append(",continuation=").append(continuation);
b.append(']');
return b.toString();
}
}

8
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriverTest.java
View File

@ -86,10 +86,10 @@ public class WebSocketEventDriverTest
socket.capture.assertEventCount(6);
socket.capture.assertEventStartsWith(0,"onConnect(");
socket.capture.assertEventStartsWith(1,"onFrame(Ping");
socket.capture.assertEventStartsWith(2,"onFrame(Text");
socket.capture.assertEventStartsWith(3,"onFrame(Binary");
socket.capture.assertEventStartsWith(4,"onFrame(Close");
socket.capture.assertEventStartsWith(1,"onFrame(PING[");
socket.capture.assertEventStartsWith(2,"onFrame(TEXT[");
socket.capture.assertEventStartsWith(3,"onFrame(BINARY[");
socket.capture.assertEventStartsWith(4,"onFrame(CLOSE[");
socket.capture.assertEventStartsWith(5,"onClose(1001,");
}