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

Issue #207 - Improved testing reliability

This commit is contained in:
Joakim Erdfelt 2017-05-11 13:20:31 -07:00
parent 5701de4fd8
commit 2ed56d4142
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DecoderTextStreamTest.java
View File

@ -37,7 +37,7 @@ import javax.websocket.Decoder;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.websocket.common.WebSocketFrame; import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions; import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.io.FutureFrameCallback; import org.eclipse.jetty.websocket.common.io.CompletableFutureFrameCallback;
import org.eclipse.jetty.websocket.jsr356.JsrSession; import org.eclipse.jetty.websocket.jsr356.JsrSession;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedReaderMessageSink; import org.eclipse.jetty.websocket.jsr356.messages.DecodedReaderMessageSink;
import org.eclipse.jetty.websocket.tests.jsr356.DummyJsrEndpointFunctions; import org.eclipse.jetty.websocket.tests.jsr356.DummyJsrEndpointFunctions;
@ -95,18 +95,25 @@ public class DecoderTextStreamTest
return null; return null;
}); });
List<FutureFrameCallback> callbacks = new ArrayList<>(); List<CompletableFutureFrameCallback> callbacks = new ArrayList<>();
CompletableFutureFrameCallback finCallback = null;
List<WebSocketFrame> frames = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt"); List<WebSocketFrame> frames = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt");
for (WebSocketFrame frame : frames) for (WebSocketFrame frame : frames)
{ {
FutureFrameCallback callback = new FutureFrameCallback(); CompletableFutureFrameCallback callback = new CompletableFutureFrameCallback();
if (frame.isFin())
{
finCallback = callback;
}
callbacks.add(callback); callbacks.add(callback);
sink.accept(frame, callback); sink.accept(frame, callback);
} }
assertThat("Should have found finCallback", finCallback, notNullValue());
finCallback.get(1, TimeUnit.SECONDS); // wait for fin
Quotes quotes = futureQuotes.get(1, TimeUnit.SECONDS); Quotes quotes = futureQuotes.get(1, TimeUnit.SECONDS);
assertThat("Quotes", quotes, notNullValue()); assertThat("Quotes", quotes, notNullValue());
for (FutureFrameCallback callback : callbacks) for (CompletableFutureFrameCallback callback : callbacks)
{ {
assertThat("Callback", callback.isDone(), is(true)); assertThat("Callback", callback.isDone(), is(true));
} }