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

Fixes #2246 - Reworking await for messages to be more resilient

This commit is contained in:
Joakim Erdfelt 2018-02-26 13:33:30 -06:00
parent 6fa855e856
commit dc87eec9bd
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnMessageReturnTest.java
View File

@ -19,8 +19,8 @@
package org.eclipse.jetty.websocket.jsr356.server; package org.eclipse.jetty.websocket.jsr356.server;
import java.net.URI; import java.net.URI;
import java.util.Queue;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
@ -28,6 +28,8 @@ import org.eclipse.jetty.io.MappedByteBufferPool;
import org.eclipse.jetty.toolchain.test.TestingDir; import org.eclipse.jetty.toolchain.test.TestingDir;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
import org.eclipse.jetty.websocket.api.annotations.WebSocket;
import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.jsr356.server.samples.echo.EchoReturnEndpoint; import org.eclipse.jetty.websocket.jsr356.server.samples.echo.EchoReturnEndpoint;
import org.junit.Assert; import org.junit.Assert;
@ -44,7 +46,7 @@ public class OnMessageReturnTest
@Test @Test
public void testEchoReturn() throws Exception public void testEchoReturn() throws Exception
{ {
WSServer wsb = new WSServer(testdir,"app"); WSServer wsb = new WSServer(testdir, "app");
wsb.copyWebInf("empty-web.xml"); wsb.copyWebInf("empty-web.xml");
wsb.copyClass(EchoReturnEndpoint.class); wsb.copyClass(EchoReturnEndpoint.class);
@ -60,13 +62,13 @@ public class OnMessageReturnTest
try try
{ {
client.start(); client.start();
JettyEchoSocket clientEcho = new JettyEchoSocket(); ClientEchoSocket clientEcho = new ClientEchoSocket();
Future<Session> future = client.connect(clientEcho,uri.resolve("echoreturn")); Future<Session> future = client.connect(clientEcho, uri.resolve("echoreturn"));
// wait for connect // wait for connect
future.get(1,TimeUnit.SECONDS); Session session = future.get(1, TimeUnit.SECONDS);
clientEcho.sendMessage("Hello World"); session.getRemote().sendString("Hello World");
Queue<String> msgs = clientEcho.awaitMessages(1); String msg = clientEcho.messages.poll(2, TimeUnit.SECONDS);
Assert.assertEquals("Expected message","Hello World",msgs.poll()); Assert.assertEquals("Expected message", "Hello World", msg);
} }
finally finally
{ {
@ -79,4 +81,15 @@ public class OnMessageReturnTest
} }
} }
@WebSocket
public static class ClientEchoSocket
{
public LinkedBlockingQueue<String> messages = new LinkedBlockingQueue<>();
@OnWebSocketMessage
public void onText(String msg)
{
messages.offer(msg);
}
}
} }