diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java index bd03858d1fac..e88fe2e05384 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java @@ -29,15 +29,15 @@ public abstract class AbstractJakartaWebSocketFrameHandlerTest { protected DummyContainer container; - private WebSocketComponents components; + protected WebSocketComponents components; @BeforeEach public void startContainer() throws Exception { - container = new DummyContainer(); - container.start(); components = new WebSocketComponents(); + container = new DummyContainer(components); components.start(); + container.start(); endpointConfig = ClientEndpointConfig.Builder.create().build(); encoders = new AvailableEncoders(endpointConfig, coreSession.getWebSocketComponents()); @@ -48,8 +48,8 @@ public void startContainer() throws Exception @AfterEach public void stopContainer() { - LifeCycle.stop(components); LifeCycle.stop(container); + LifeCycle.stop(components); } protected AvailableEncoders encoders; diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractSessionTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractSessionTest.java index 4f0b2e7359f9..8e32dc3a4b14 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractSessionTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/AbstractSessionTest.java @@ -29,8 +29,8 @@ public abstract class AbstractSessionTest { - protected JakartaWebSocketContainer container = new DummyContainer(); protected WebSocketComponents components = new WebSocketComponents(); + protected JakartaWebSocketContainer container = new DummyContainer(components); protected TestCoreSession coreSession = new TestCoreSession(components); protected JakartaWebSocketSession session; diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/DummyContainer.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/DummyContainer.java index 28f34bd3029f..6e11f2ecc097 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/DummyContainer.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/DummyContainer.java @@ -21,7 +21,6 @@ import jakarta.websocket.DeploymentException; import jakarta.websocket.Endpoint; import jakarta.websocket.Session; -import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; @@ -31,15 +30,11 @@ public class DummyContainer extends JakartaWebSocketContainer { private final JakartaWebSocketFrameHandlerFactory frameHandlerFactory; - private final QueuedThreadPool executor; - public DummyContainer() + public DummyContainer(WebSocketComponents components) { - super(new WebSocketComponents()); + super(components); this.frameHandlerFactory = new DummyFrameHandlerFactory(this); - this.executor = new QueuedThreadPool(); - this.executor.setName("qtp-DummyContainer"); - addBean(this.executor, true); } @Override @@ -113,7 +108,7 @@ public void setDefaultMaxTextMessageBufferSize(int max) @Override public Executor getExecutor() { - return executor; + return getWebSocketComponents().getExecutor(); } @Override diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java index 98e06b57789a..5a4c19366a22 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java @@ -30,12 +30,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJakartaWebSocketFrameHandlerTest { @SuppressWarnings("Duplicates") private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception { + assertTrue(components.isStarted()); JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java index 81c6bc9d33bd..8368e87baf69 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java @@ -30,15 +30,15 @@ public abstract class AbstractJakartaWebSocketFrameHandlerTest { protected DummyContainer container; - private WebSocketComponents components; + protected WebSocketComponents components; @BeforeEach public void startContainer() throws Exception { - container = new DummyContainer(); - container.start(); components = new WebSocketComponents(); + container = new DummyContainer(components); components.start(); + container.start(); endpointConfig = ClientEndpointConfig.Builder.create().build(); encoders = new AvailableEncoders(endpointConfig, coreSession.getWebSocketComponents()); @@ -49,8 +49,8 @@ public void startContainer() throws Exception @AfterEach public void stopContainer() { - LifeCycle.stop(components); LifeCycle.stop(container); + LifeCycle.stop(components); } protected AvailableEncoders encoders; diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractSessionTest.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractSessionTest.java index 7f4733351262..181063f9f1c5 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractSessionTest.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/AbstractSessionTest.java @@ -29,16 +29,16 @@ public abstract class AbstractSessionTest { - protected JakartaWebSocketContainer container = new DummyContainer(); protected WebSocketComponents components = new WebSocketComponents(); + protected JakartaWebSocketContainer container = new DummyContainer(components); protected TestCoreSession coreSession = new TestCoreSession(components); protected JakartaWebSocketSession session; @BeforeEach public void initSession() throws Exception { - container.start(); components.start(); + container.start(); Object websocketPojo = new DummyEndpoint(); UpgradeRequest upgradeRequest = new UpgradeRequestAdapter(); JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest); @@ -49,8 +49,8 @@ public void initSession() throws Exception @AfterEach public void stopContainer() throws Exception { - components.stop(); container.stop(); + components.stop(); } public static class TestCoreSession extends CoreSession.Empty diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/DummyContainer.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/DummyContainer.java index f0d9df9fe5ff..bf1cb99dc5c9 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/DummyContainer.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/DummyContainer.java @@ -21,7 +21,6 @@ import jakarta.websocket.DeploymentException; import jakarta.websocket.Endpoint; import jakarta.websocket.Session; -import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; @@ -31,15 +30,11 @@ public class DummyContainer extends JakartaWebSocketContainer { private final JakartaWebSocketFrameHandlerFactory frameHandlerFactory; - private final QueuedThreadPool executor; - public DummyContainer() + public DummyContainer(WebSocketComponents components) { - super(new WebSocketComponents()); + super(components); this.frameHandlerFactory = new DummyFrameHandlerFactory(this); - this.executor = new QueuedThreadPool(); - this.executor.setName("qtp-DummyContainer"); - addBean(this.executor, true); } @Override @@ -113,7 +108,7 @@ public void setDefaultMaxTextMessageBufferSize(int max) @Override public Executor getExecutor() { - return executor; + return getWebSocketComponents().getExecutor(); } @Override diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java index 5b6b183e9a8b..f009fcc2248f 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jakarta-common/src/test/java/org/eclipse/jetty/ee11/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java @@ -30,12 +30,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJakartaWebSocketFrameHandlerTest { @SuppressWarnings("Duplicates") private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception { + assertTrue(components.isStarted()); JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests