This is an automated email from the ASF dual-hosted git repository.
rjung 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 8eea901875 Now that we have two native OpenSSL implementation, use a
somewhat less misleading variable name in unit tests.
new 60c4a31345 Merge branch 'main' of https://github.com/apache/tomcat
8eea901875 is described below
commit 8eea9018754804d5e3fb6d258df1ce08e13bae99
Author: Rainer Jung <rainer.j...@kippdata.de>
AuthorDate: Thu Apr 18 16:40:41 2024 +0200
Now that we have two native OpenSSL implementation, use a somewhat less
misleading variable name in unit tests.
---
test/org/apache/catalina/valves/rewrite/TestResolverSSL.java | 4 ++--
test/org/apache/coyote/http2/TestLargeUpload.java | 4 ++--
test/org/apache/tomcat/util/net/TestClientCert.java | 4 ++--
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 6 +++---
test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java | 4 ++--
test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 4 ++--
.../apache/tomcat/util/net/TestSSLHostConfigIntegration.java | 4 ++--
test/org/apache/tomcat/util/net/TestSsl.java | 10 +++++-----
test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
.../apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 4 ++--
.../apache/tomcat/websocket/TestWsWebSocketContainerSSL.java | 4 ++--
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index 6b7de8ef2c..2bebd2cbf5 100644
--- a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -60,7 +60,7 @@ public class TestResolverSSL extends TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -172,7 +172,7 @@ public class TestResolverSSL extends TomcatBaseTest {
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName",
sslImplementationName));
- if (needApr) {
+ if (useOpenSSL) {
AprLifecycleListener listener = new AprLifecycleListener();
Assume.assumeTrue(AprLifecycleListener.isAprAvailable());
StandardServer server = (StandardServer) tomcat.getServer();
diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java
b/test/org/apache/coyote/http2/TestLargeUpload.java
index 5904eba8fe..33da9b5879 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -66,7 +66,7 @@ public class TestLargeUpload extends Http2TestBase {
public String connectorName;
@Parameter(3)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(4)
public String sslImplementationName;
@@ -159,6 +159,6 @@ public class TestLargeUpload extends Http2TestBase {
Tomcat tomcat = getTomcatInstance();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
}
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCert.java
b/test/org/apache/tomcat/util/net/TestClientCert.java
index 7ebfb4c308..eeabba688c 100644
--- a/test/org/apache/tomcat/util/net/TestClientCert.java
+++ b/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -57,7 +57,7 @@ public class TestClientCert extends TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -216,6 +216,6 @@ public class TestClientCert extends TomcatBaseTest {
TesterSupport.configureClientSsl();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
}
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 742668f062..786d42283f 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -64,7 +64,7 @@ public class TestClientCertTls13 extends TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -107,9 +107,9 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureClientSsl();
Connector connector = tomcat.getConnector();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
- if (needApr) {
+ if (useOpenSSL) {
if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
// Need at least OpenSSL 1.1.1 for TLSv1.3 support
Assume.assumeTrue(SSL.version() >= 0x1010100f);
diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index 4029d811cd..58ed008c62 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -61,7 +61,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest
{
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -96,7 +96,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest
{
TesterSupport.configureClientCertContext(tomcat);
Connector connector = tomcat.getConnector();
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
// 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 9059406507..47676bf118 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -63,7 +63,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -313,7 +313,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest
{
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
// Simple webapp
Context ctxt = getProgrammaticRootContext();
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
index fede2c645d..019718303f 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java
@@ -53,7 +53,7 @@ public class TestSSLHostConfigIntegration extends
TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -69,7 +69,7 @@ public class TestSSLHostConfigIntegration extends
TomcatBaseTest {
ctxt.addApplicationListener(WsContextListener.class.getName());
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
tomcat.start();
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index 99a51d3e68..29316b0a3b 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -82,7 +82,7 @@ public class TestSsl extends TomcatBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -99,7 +99,7 @@ public class TestSsl extends TomcatBaseTest {
ctxt.addApplicationListener(WsContextListener.class.getName());
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -126,7 +126,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, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
Context ctxt = getProgrammaticRootContext();
Tomcat.addServlet(ctxt, "post", new SimplePostServlet());
@@ -209,7 +209,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, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
tomcat.start();
ByteChunk res = getUrl("https://localhost:"; + getPort() +
@@ -245,7 +245,7 @@ public class TestSsl extends TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
boolean renegotiationSupported =
TesterSupport.isClientRenegotiationSupported(getTomcatInstance());
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 5d56e49989..f8055d52ca 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -240,8 +240,8 @@ public final class TesterSupport {
return true;
}
- public static void configureSSLImplementation(Tomcat tomcat, String
sslImplementationName, boolean openSSL) {
- if (openSSL) {
+ public static void configureSSLImplementation(Tomcat tomcat, String
sslImplementationName, boolean useOpenSSL) {
+ if (useOpenSSL) {
LifecycleListener listener = null;
if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
listener = new AprLifecycleListener();
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index 5abcb73a2a..b815ccd508 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -70,7 +70,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -207,6 +207,6 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
}
}
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
index b6f0fbf603..1be64765e2 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
@@ -68,7 +68,7 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
public String connectorName;
@Parameter(1)
- public boolean needApr;
+ public boolean useOpenSSL;
@Parameter(2)
public String sslImplementationName;
@@ -129,6 +129,6 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
TesterSupport.initSsl(tomcat);
- TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, needApr);
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName, useOpenSSL);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
