This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e9ab5f4b97 Refactor native tests setup
e9ab5f4b97 is described below
commit e9ab5f4b978fea783670e69427137f5aeafc5def
Author: remm <r...@apache.org>
AuthorDate: Wed Oct 25 14:41:58 2023 +0200
Refactor native tests setup
---
test/org/apache/coyote/http2/TestLargeUpload.java | 14 ++------
.../org/apache/tomcat/util/net/TestClientCert.java | 14 ++------
.../tomcat/util/net/TestClientCertTls13.java | 17 ++++-----
.../tomcat/util/net/TestCustomSslTrustManager.java | 14 ++------
.../tomcat/util/net/TestSSLHostConfigCompat.java | 14 ++------
.../util/net/TestSSLHostConfigIntegration.java | 14 ++------
test/org/apache/tomcat/util/net/TestSsl.java | 40 +++-------------------
test/org/apache/tomcat/util/net/TesterSupport.java | 27 ++++++++-------
.../websocket/TestWebSocketFrameClientSSL.java | 14 ++------
.../websocket/TestWsWebSocketContainerSSL.java | 14 ++------
10 files changed, 40 insertions(+), 142 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java
b/test/org/apache/coyote/http2/TestLargeUpload.java
index 1a8b48ffa0..02da50e4bb 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -30,7 +30,6 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -39,8 +38,6 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Tomcat;
import org.apache.coyote.http11.AbstractHttp11Protocol;
import org.apache.tomcat.util.net.TesterSupport;
@@ -58,7 +55,7 @@ public class TestLargeUpload extends Http2TestBase {
"org.apache.tomcat.util.net.jsse.JSSEImplementation" });
parameterSets.add(new Object[] { base[0], base[1], "OpenSSL",
Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"
});
- parameterSets.add(new Object[] { base[0], base[1], "OpenSSL-FFM",
Boolean.FALSE,
+ parameterSets.add(new Object[] { base[0], base[1], "OpenSSL-FFM",
Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
}
@@ -162,13 +159,6 @@ public class TestLargeUpload extends Http2TestBase {
Tomcat tomcat = getTomcatInstance();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
}
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCert.java
b/test/org/apache/tomcat/util/net/TestClientCert.java
index 38a9ef28c4..7ebfb4c308 100644
--- a/test/org/apache/tomcat/util/net/TestClientCert.java
+++ b/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -22,15 +22,12 @@ import java.util.Collection;
import java.util.List;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.Context;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -51,7 +48,7 @@ public class TestClientCert extends TomcatBaseTest {
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
return parameterSets;
}
@@ -219,13 +216,6 @@ public class TestClientCert extends TomcatBaseTest {
TesterSupport.configureClientSsl();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
}
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index a1c14a0c2d..742668f062 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -29,12 +29,11 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
/**
* The keys and certificates used in this file are all available in svn and
were
@@ -56,7 +55,7 @@ public class TestClientCertTls13 extends TomcatBaseTest {
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
return parameterSets;
}
@@ -108,15 +107,13 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureClientSsl();
Connector connector = tomcat.getConnector();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- // Need at least OpenSSL 1.1.1 for TLSv1.3 support
- Assume.assumeTrue(SSL.version() >= 0x1010100f);
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
+ if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+ // Need at least OpenSSL 1.1.1 for TLSv1.3 support
+ Assume.assumeTrue(SSL.version() >= 0x1010100f);
+ }
}
// Tests default to TLSv1.2 when client cert auth is used
diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index 6c6b929db6..4029d811cd 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -24,15 +24,12 @@ import java.util.List;
import javax.net.ssl.SSLException;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.coyote.ProtocolHandler;
@@ -55,7 +52,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest
{
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
return parameterSets;
}
@@ -99,14 +96,7 @@ public class TestCustomSslTrustManager extends
TomcatBaseTest {
TesterSupport.configureClientCertContext(tomcat);
Connector connector = tomcat.getConnector();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
// Override the defaults
ProtocolHandler handler = connector.getProtocolHandler();
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index d84c0b56a9..b6a94f1bc8 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.List;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -30,8 +29,6 @@ import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -56,7 +53,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation", storeType});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation", storeType});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation", storeType});
}
return parameterSets;
@@ -315,14 +312,7 @@ public class TestSSLHostConfigCompat extends
TomcatBaseTest {
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
// Simple webapp
Context ctxt = tomcat.addContext("", null);
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
index c1f0a48a07..fede2c645d 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
@@ -24,14 +24,11 @@ import java.util.Collection;
import java.util.List;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.websocket.server.WsContextListener;
@@ -47,7 +44,7 @@ public class TestSSLHostConfigIntegration extends
TomcatBaseTest {
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
return parameterSets;
}
@@ -72,14 +69,7 @@ public class TestSSLHostConfigIntegration extends
TomcatBaseTest {
ctxt.addApplicationListener(WsContextListener.class.getName());
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
tomcat.start();
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index debabab9b7..85c4fa7c98 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -52,8 +52,6 @@ import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -76,7 +74,7 @@ public class TestSsl extends TomcatBaseTest {
parameterSets.add(new Object[] {
"OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
parameterSets.add(new Object[] {
- "OpenSSL-FFM", Boolean.FALSE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+ "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
return parameterSets;
}
@@ -102,14 +100,7 @@ public class TestSsl extends TomcatBaseTest {
ctxt.addApplicationListener(WsContextListener.class.getName());
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -136,14 +127,7 @@ public class TestSsl extends TomcatBaseTest {
Connector connector = tomcat.getConnector();
// Increase timeout as default (3s) can be too low for some CI systems
Assert.assertTrue(connector.setProperty("connectionTimeout", "20000"));
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
Context ctxt = tomcat.addContext("", null);
Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
@@ -226,14 +210,7 @@ public class TestSsl extends TomcatBaseTest {
TesterSupport.initSsl(tomcat, TesterSupport.LOCALHOST_KEYPASS_JKS,
TesterSupport.JKS_PASS, null, TesterSupport.JKS_KEY_PASS,
null);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -270,18 +247,11 @@ public class TestSsl extends TomcatBaseTest {
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
TesterSupport.isClientRenegotiationSupported(getTomcatInstance()));
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
-
Context root = tomcat.addContext("", TEMP_DIR);
Wrapper w =
Tomcat.addServlet(root, "tester", new TesterServlet());
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 008b9537ec..5d56e49989 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -52,9 +52,11 @@ import org.junit.Assert;
import org.junit.Assume;
import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleListener;
import org.apache.catalina.authenticator.SSLAuthenticator;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.AprLifecycleListener;
+import org.apache.catalina.core.OpenSSLLifecycleListener;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.Tomcat;
@@ -66,7 +68,7 @@ import
org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.apache.tomcat.util.net.jsse.JSSEImplementation;
-import org.apache.tomcat.util.net.openssl.OpenSSLStatus;
+import org.apache.tomcat.util.net.openssl.OpenSSLImplementation;
public final class TesterSupport {
@@ -238,19 +240,18 @@ public final class TesterSupport {
return true;
}
- public static void configureSSLImplementation(Tomcat tomcat, String
sslImplementationName) {
- try {
- Class.forName(sslImplementationName);
- if
("org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation".equals(sslImplementationName))
{
- Class<?> openSSLLibraryClass =
Class.forName("org.apache.tomcat.util.net.openssl.panama.OpenSSLLibrary");
- openSSLLibraryClass.getMethod("init").invoke(null);
- Assume.assumeTrue(OpenSSLStatus.isAvailable());
- }
- } catch (Throwable t) {
- while (t.getCause() != null) {
- t = t.getCause();
+ public static void configureSSLImplementation(Tomcat tomcat, String
sslImplementationName, boolean openSSL) {
+ if (openSSL) {
+ LifecycleListener listener = null;
+ if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
+ listener = new AprLifecycleListener();
+ Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
+ } else {
+ listener = new OpenSSLLifecycleListener();
+ Assume.assumeTrue(OpenSSLLifecycleListener.isAvailable());
}
- Assume.assumeFalse(t.getMessage(), Boolean.TRUE);
+ StandardServer server = (StandardServer) tomcat.getServer();
+ server.addLifecycleListener(listener);
}
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName",
sslImplementationName));
}
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index 5bb3f66812..341ff97c8c 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -38,15 +38,12 @@ import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.Context;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.net.TesterSupport;
@@ -63,7 +60,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
parameterSets.add(new Object[] { "JSSE", Boolean.FALSE,
"org.apache.tomcat.util.net.jsse.JSSEImplementation" });
parameterSets.add(
new Object[] { "OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
- parameterSets.add(new Object[] { "OpenSSL-FFM", Boolean.FALSE,
+ parameterSets.add(new Object[] { "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
return parameterSets;
@@ -204,13 +201,6 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
}
}
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
index 70438628a5..64e9e59c92 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
@@ -37,15 +37,12 @@ import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.apache.catalina.Context;
-import org.apache.catalina.core.AprLifecycleListener;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.util.net.TesterSupport;
@@ -61,7 +58,7 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
parameterSets.add(new Object[] { "JSSE", Boolean.FALSE,
"org.apache.tomcat.util.net.jsse.JSSEImplementation" });
parameterSets.add(
new Object[] { "OpenSSL", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation" });
- parameterSets.add(new Object[] { "OpenSSL-FFM", Boolean.FALSE,
+ parameterSets.add(new Object[] { "OpenSSL-FFM", Boolean.TRUE,
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
return parameterSets;
@@ -132,13 +129,6 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
-
- if (needApr) {
- AprLifecycleListener listener = new AprLifecycleListener();
- Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
- StandardServer server = (StandardServer) tomcat.getServer();
- server.addLifecycleListener(listener);
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
