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

JETTY-1463 websocket D0 parser should return progress even if no fill done

This commit is contained in:
Greg Wilkins 2011-12-20 14:54:50 +11:00
parent b67961ada3
commit 070a2b5759
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketParserD00Test.java
View File

@ -15,6 +15,7 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.jetty.websocket; package org.eclipse.jetty.websocket;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -61,7 +62,7 @@ public class WebSocketParserD00Test
int filled =_parser.parseNext(); int filled =_parser.parseNext();
assertEquals(13,filled); assertThat(filled,greaterThan(0));
assertEquals("Hello World",_handler._data.get(0)); assertEquals("Hello World",_handler._data.get(0));
assertTrue(_parser.isBufferEmpty()); assertTrue(_parser.isBufferEmpty());
assertTrue(_parser.getBuffer()==null); assertTrue(_parser.getBuffer()==null);
@ -79,14 +80,14 @@ public class WebSocketParserD00Test
int filled =_parser.parseNext(); int filled =_parser.parseNext();
assertEquals(30,filled); assertThat(filled,greaterThan(0));
assertEquals("Hello World",_handler._data.get(0)); assertEquals("Hello World",_handler._data.get(0));
assertFalse(_parser.isBufferEmpty()); assertFalse(_parser.isBufferEmpty());
assertFalse(_parser.getBuffer()==null); assertFalse(_parser.getBuffer()==null);
filled =_parser.parseNext(); filled =_parser.parseNext();
assertEquals(0,filled); assertThat(filled,greaterThan(0));
assertEquals("Hell\uFF4f W\uFF4Frld",_handler._data.get(1)); assertEquals("Hell\uFF4f W\uFF4Frld",_handler._data.get(1));
assertTrue(_parser.isBufferEmpty()); assertTrue(_parser.isBufferEmpty());
assertTrue(_parser.getBuffer()==null); assertTrue(_parser.getBuffer()==null);
@ -101,7 +102,7 @@ public class WebSocketParserD00Test
int filled =_parser.parseNext(); int filled =_parser.parseNext();
assertEquals(13,filled); assertThat(filled,greaterThan(0));
assertEquals("Hello World",_handler._data.get(0)); assertEquals("Hello World",_handler._data.get(0));
assertTrue(_parser.isBufferEmpty()); assertTrue(_parser.isBufferEmpty());
assertTrue(_parser.getBuffer()==null); assertTrue(_parser.getBuffer()==null);
@ -123,15 +124,14 @@ public class WebSocketParserD00Test
_in.put((byte)(data.length&0x7f)); _in.put((byte)(data.length&0x7f));
_in.put(data); _in.put(data);
int filled =_parser.parseNext(); int filled =_parser.parseNext();
assertEquals(13+3+data.length,filled); assertThat(filled,greaterThan(0));
assertEquals("Hello World",_handler._data.get(0)); assertEquals("Hello World",_handler._data.get(0));
assertFalse(_parser.isBufferEmpty()); assertFalse(_parser.isBufferEmpty());
assertFalse(_parser.getBuffer()==null); assertFalse(_parser.getBuffer()==null);
filled =_parser.parseNext(); filled =_parser.parseNext();
assertEquals(0,filled); assertThat(filled,greaterThan(0));
String got=_handler._data.get(1); String got=_handler._data.get(1);
assertEquals(data.length,got.length()); assertEquals(data.length,got.length());
assertTrue(got.startsWith("012345678901234567890123")); assertTrue(got.startsWith("012345678901234567890123"));