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

Ensure Client ContainerProvider behavior is reset properly. 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-08-10 11:14:10 -05:00
parent 88b1a3d3d7
commit a107ac3b8a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class DelayedStartClientOnServerTest
return msg;
}
}
/**
* Using the Client specific techniques of JSR356, connect to the echo socket
* and perform an echo request.

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

@ -34,7 +34,9 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.jsr356.JettyClientContainerProvider;
import org.eclipse.jetty.websocket.jsr356.server.samples.echo.LargeEchoAnnotatedSocket;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -111,6 +113,13 @@ public class LargeNestedClientContainerTest
return scenarios;
}
@After
public void resetClientContainerProvider()
{
JettyClientContainerProvider.useServerContainer(false);
JettyClientContainerProvider.useSingleton(false);
}
private static final AtomicInteger appDirIdx = new AtomicInteger(0);
@Parameterized.Parameter