Merge branch 'jetty-9.2.x' into jetty-9.3.x

This commit is contained in:
Joakim Erdfelt 2016-08-16 06:29:58 -07:00
commit 988e34489b

View File

@ -18,6 +18,8 @@
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.jsr356;
import static org.hamcrest.Matchers.instanceOf;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -43,10 +45,9 @@ import org.junit.AfterClass;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.Matchers.instanceOf;
/** /**
* This class tests receiving of messages by different types of {@link MessageHandler} * This class tests receiving of messages by different types of {@link MessageHandler}
*/ */
@ -109,6 +110,7 @@ public class MessageReceivingTest {
* @throws Exception on exception occur * @throws Exception on exception occur
*/ */
@Test @Test
@Ignore("flappy test")
public void testWholeTextMessage() throws Exception { public void testWholeTextMessage() throws Exception {
final TestEndpoint echoer = new TestEndpoint(new WholeStringCaptureHandler()); final TestEndpoint echoer = new TestEndpoint(new WholeStringCaptureHandler());
Assert.assertThat(echoer, instanceOf(javax.websocket.Endpoint.class)); Assert.assertThat(echoer, instanceOf(javax.websocket.Endpoint.class));