From 69b6eb1f3eea6ad9ade8695a9d0e69bb57e9417d Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 24 Jun 2022 10:50:57 +1000 Subject: [PATCH] re-enable ContainerProviderServerTest for websocket ee9 & ee10 Signed-off-by: Lachlan Roberts --- .../jakarta/tests/server/ContainerProviderServerTest.java | 2 -- .../jakarta/tests/server/ContainerProviderServerTest.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/ContainerProviderServerTest.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/ContainerProviderServerTest.java index 27caa3405fc..84ab9e5c3ec 100644 --- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/ContainerProviderServerTest.java +++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee10/websocket/jakarta/tests/server/ContainerProviderServerTest.java @@ -27,7 +27,6 @@ import org.eclipse.jetty.ee10.websocket.jakarta.tests.WSServer; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static jakarta.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE; @@ -71,7 +70,6 @@ public class ContainerProviderServerTest server.stop(); } - @Disabled @Test public void testJakartaWsContainerInServer() throws Exception { diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/ContainerProviderServerTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/ContainerProviderServerTest.java index aeacbeb06d8..41f2433e136 100644 --- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/ContainerProviderServerTest.java +++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-tests/src/test/java/org/eclipse/jetty/ee9/websocket/jakarta/tests/server/ContainerProviderServerTest.java @@ -27,7 +27,6 @@ import org.eclipse.jetty.ee9.websocket.jakarta.tests.WSServer; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static jakarta.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE; @@ -71,7 +70,6 @@ public class ContainerProviderServerTest server.stop(); } - @Disabled @Test public void testJakartaWsContainerInServer() throws Exception {