diff options
| author | Greg Wilkins | 2014-07-23 06:38:15 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-07-23 06:38:15 +0000 |
| commit | ecb3ab7e5bab9cad1338708c184d127c00a1bff5 (patch) | |
| tree | 2f7013cadb57642e4b1045ee7609f5bb34cb211b /jetty-websocket/javax-websocket-client-impl/src | |
| parent | 07edbea6fec3b6078ff7606e5e2ee5909145b41d (diff) | |
| parent | e199b671bb486432498a55b83e5ede89f75d212c (diff) | |
| download | org.eclipse.jetty.project-ecb3ab7e5bab9cad1338708c184d127c00a1bff5.tar.gz org.eclipse.jetty.project-ecb3ab7e5bab9cad1338708c184d127c00a1bff5.tar.xz org.eclipse.jetty.project-ecb3ab7e5bab9cad1338708c184d127c00a1bff5.zip | |
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
Diffstat (limited to 'jetty-websocket/javax-websocket-client-impl/src')
| -rw-r--r-- | jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java index 06c06565bc..7090e22a06 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java @@ -252,6 +252,8 @@ public class DecoderReaderTest server.stop(); } + // TODO analyse and fix + @Ignore @Test public void testSingleQuotes() throws Exception { @@ -268,7 +270,9 @@ public class DecoderReaderTest Assert.assertThat("Quotes Author",quotes.author,is("Benjamin Franklin")); Assert.assertThat("Quotes Count",quotes.quotes.size(),is(3)); } - + + // TODO analyse and fix + @Ignore @Test @Ignore ("Quotes appear to be able to arrive in any order?") public void testTwoQuotes() throws Exception |