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

Issue #1650 - testcase stability effort

This commit is contained in:
Joakim Erdfelt 2017-07-03 12:32:02 -07:00
parent ed692f3917
commit 2fc86c209b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/basicapp/BasicAppTest.java
View File

@ -111,9 +111,7 @@ public class BasicAppTest
socket.close(StatusCode.NORMAL,"Test complete"); socket.close(StatusCode.NORMAL,"Test complete");
socket.awaitClose(5,TimeUnit.SECONDS); socket.awaitClose(5,TimeUnit.SECONDS);
assertThat("Messages received",socket.getTextMessages().size(),is(1));
String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS); String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
assertThat("Message[0]",response,is("Hello World")); assertThat("Message[0]",response,is("Hello World"));
} }
finally finally

9
jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/cdiapp/CdiAppTest.java
View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.cdi.websocket.cdiapp;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import java.io.File; import java.io.File;
@ -139,8 +140,7 @@ public class CdiAppTest
socket.close(StatusCode.NORMAL,"Test complete"); socket.close(StatusCode.NORMAL,"Test complete");
socket.awaitClose(2,TimeUnit.SECONDS); socket.awaitClose(2,TimeUnit.SECONDS);
assertThat("Messages received",socket.getTextMessages().size(),is(1)); String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
String response = socket.getTextMessages().poll();
assertThat("Message[0]",response, assertThat("Message[0]",response,
allOf( allOf(
@ -170,9 +170,10 @@ public class CdiAppTest
socket.close(StatusCode.NORMAL,"Test complete"); socket.close(StatusCode.NORMAL,"Test complete");
socket.awaitClose(2,TimeUnit.SECONDS); socket.awaitClose(2,TimeUnit.SECONDS);
assertThat("Messages received",socket.getTextMessages().size(),is(2)); String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
String response = socket.getTextMessages().poll();
assertThat("Message[0]",response,containsString("Hello there stuff")); assertThat("Message[0]",response,containsString("Hello there stuff"));
response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
assertThat("Message[1]",response,notNullValue());
} }
finally finally
{ {