This is an automated email from the ASF dual-hosted git repository. bonampak pushed a commit to branch feature/jakarta-jetty-upgrade in repository https://gitbox.apache.org/repos/asf/knox.git
commit 972fc9357d89fa313c3842c3ccc401d3860dfe9a Author: bonampak <[email protected]> AuthorDate: Mon Apr 27 14:40:20 2026 +0200 KNOX-3238: fix some websocket tests. --- .../src/test/java/org/apache/knox/gateway/websockets/BadSocket.java | 2 +- .../org/apache/knox/gateway/websockets/ConnectionDroppedTest.java | 1 + .../org/apache/knox/gateway/websockets/WebsocketEchoTestBase.java | 6 +++--- .../gateway/websockets/WebsocketServerInitiatedMessageTest.java | 2 +- .../knox/gateway/websockets/WebsocketServerInitiatedPingTest.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java index d459044e8..7ef26f4a4 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java @@ -26,7 +26,7 @@ import org.eclipse.jetty.websocket.api.Session; * * @since 0.10 */ -class BadSocket extends Session.Listener.AbstractAutoDemanding { +public class BadSocket extends Session.Listener.AbstractAutoDemanding { private Session session; diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java index c462aa044..0129b45dc 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java @@ -116,6 +116,7 @@ public class ConnectionDroppedTest { private static void startProxy() throws Exception { GatewayConfig gatewayConfig = EasyMock.createNiceMock(GatewayConfig.class); + EasyMock.replay(gatewayConfig); proxy = new Server(); proxyConnector = new ServerConnector(proxy); proxy.addConnector(proxyConnector); diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTestBase.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTestBase.java index 6798bf135..1c42998b4 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTestBase.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTestBase.java @@ -94,7 +94,7 @@ public class WebsocketEchoTestBase { */ public static URI serverUri; - public static Handler handler; + public static Handler.Wrapper handler; private static File topoDir; private static Path dataDir; @@ -157,8 +157,8 @@ public class WebsocketEchoTestBase { ContextHandler context = new ContextHandler(); context.setContextPath("/"); - context.setHandler(handler); - backendServer.setHandler(context); + handler.setHandler(context); + backendServer.setHandler(handler); // Start Server backendServer.start(); diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedMessageTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedMessageTest.java index 938f4a45d..c148f516b 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedMessageTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedMessageTest.java @@ -109,7 +109,7 @@ public class WebsocketServerInitiatedMessageTest extends WebsocketEchoTestBase { /** * A simple socket initiating message on connect */ - private static class ServerInitiatingMessageSocket extends Session.Listener.AbstractAutoDemanding { + public static class ServerInitiatingMessageSocket extends Session.Listener.AbstractAutoDemanding { @Override public void onWebSocketError(Throwable cause) { diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedPingTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedPingTest.java index 9f38d6f57..da7078497 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedPingTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketServerInitiatedPingTest.java @@ -112,7 +112,7 @@ public class WebsocketServerInitiatedPingTest extends WebsocketEchoTestBase { /** * A simple socket initiating message on connect */ - private static class ServerInitiatingPingSocket extends Session.Listener.AbstractAutoDemanding { + public static class ServerInitiatingPingSocket extends Session.Listener.AbstractAutoDemanding { @Override public void onWebSocketError(Throwable cause) {
