Fix broken tests using WebSocketComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
parent
14c09e3c98
commit
de8cbcf588
|
@ -18,6 +18,7 @@ import javax.websocket.EndpointConfig;
|
|||
import javax.websocket.Session;
|
||||
|
||||
import org.eclipse.jetty.websocket.core.CoreSession;
|
||||
import org.eclipse.jetty.websocket.core.WebSocketComponents;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
|
||||
|
@ -25,16 +26,26 @@ public abstract class AbstractSessionTest
|
|||
{
|
||||
protected static JavaxWebSocketSession session;
|
||||
protected static JavaxWebSocketContainer container;
|
||||
protected static WebSocketComponents components;
|
||||
|
||||
@BeforeAll
|
||||
public static void initSession() throws Exception
|
||||
{
|
||||
container = new DummyContainer();
|
||||
container.start();
|
||||
components = new WebSocketComponents();
|
||||
components.start();
|
||||
Object websocketPojo = new DummyEndpoint();
|
||||
UpgradeRequest upgradeRequest = new UpgradeRequestAdapter();
|
||||
JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest);
|
||||
CoreSession coreSession = new CoreSession.Empty();
|
||||
CoreSession coreSession = new CoreSession.Empty()
|
||||
{
|
||||
@Override
|
||||
public WebSocketComponents getWebSocketComponents()
|
||||
{
|
||||
return components;
|
||||
}
|
||||
};
|
||||
session = new JavaxWebSocketSession(container, coreSession, frameHandler, container.getFrameHandlerFactory()
|
||||
.newDefaultEndpointConfig(websocketPojo.getClass()));
|
||||
}
|
||||
|
@ -42,6 +53,7 @@ public abstract class AbstractSessionTest
|
|||
@AfterAll
|
||||
public static void stopContainer() throws Exception
|
||||
{
|
||||
components.stop();
|
||||
container.stop();
|
||||
}
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
package org.eclipse.jetty.websocket.javax.tests.client;
|
||||
|
||||
import org.eclipse.jetty.websocket.core.CoreSession;
|
||||
import org.eclipse.jetty.websocket.core.WebSocketComponents;
|
||||
import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig;
|
||||
import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
|
||||
import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
|
||||
|
@ -29,16 +30,26 @@ public abstract class AbstractClientSessionTest
|
|||
{
|
||||
protected static JavaxWebSocketSession session;
|
||||
protected static JavaxWebSocketContainer container;
|
||||
protected static WebSocketComponents components;
|
||||
|
||||
@BeforeAll
|
||||
public static void initSession() throws Exception
|
||||
{
|
||||
container = new JavaxWebSocketClientContainer();
|
||||
container.start();
|
||||
components = new WebSocketComponents();
|
||||
components.start();
|
||||
Object websocketPojo = new DummyEndpoint();
|
||||
UpgradeRequest upgradeRequest = new UpgradeRequestAdapter();
|
||||
JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest);
|
||||
CoreSession coreSession = new CoreSession.Empty();
|
||||
CoreSession coreSession = new CoreSession.Empty()
|
||||
{
|
||||
@Override
|
||||
public WebSocketComponents getWebSocketComponents()
|
||||
{
|
||||
return components;
|
||||
}
|
||||
};
|
||||
session = new JavaxWebSocketSession(container, coreSession, frameHandler, new BasicClientEndpointConfig());
|
||||
}
|
||||
|
||||
|
|
|
@ -27,10 +27,13 @@ import org.eclipse.jetty.util.IO;
|
|||
import org.eclipse.jetty.websocket.core.CoreSession;
|
||||
import org.eclipse.jetty.websocket.core.Frame;
|
||||
import org.eclipse.jetty.websocket.core.OpCode;
|
||||
import org.eclipse.jetty.websocket.core.WebSocketComponents;
|
||||
import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
|
||||
import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
|
||||
import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter;
|
||||
import org.eclipse.jetty.websocket.javax.tests.WSEventTracker;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
|
@ -38,6 +41,20 @@ import static org.hamcrest.Matchers.is;
|
|||
|
||||
public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketServerFrameHandlerTest
|
||||
{
|
||||
private static final WebSocketComponents components = new WebSocketComponents();
|
||||
|
||||
@BeforeAll
|
||||
public static void beforeAll() throws Exception
|
||||
{
|
||||
components.start();
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
public static void afterAll() throws Exception
|
||||
{
|
||||
components.stop();
|
||||
}
|
||||
|
||||
@SuppressWarnings("Duplicates")
|
||||
private <T extends WSEventTracker> T performOnMessageInvocation(T socket, Consumer<JavaxWebSocketFrameHandler> func) throws Exception
|
||||
{
|
||||
|
@ -46,7 +63,14 @@ public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJ
|
|||
|
||||
// Establish endpoint function
|
||||
JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(socket, request);
|
||||
frameHandler.onOpen(new CoreSession.Empty(), Callback.NOOP);
|
||||
frameHandler.onOpen(new CoreSession.Empty()
|
||||
{
|
||||
@Override
|
||||
public WebSocketComponents getWebSocketComponents()
|
||||
{
|
||||
return components;
|
||||
}
|
||||
}, Callback.NOOP);
|
||||
func.accept(frameHandler);
|
||||
return socket;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue