You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/15 12:21:50 UTC
[tomcat] branch master updated (4036762 -> 9b328a6)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 4036762 Remove deprecated method
new fa1e9ce Remove @SuppressWarnings that is now unnecessary
new 200d15a Check that uses of Connector.setProperty() in tests complete correctly
new e6127ef Remove debug code
new 4c91d86 Correct property name
new 5e546d0 Correct property name
new ba8730a Correct property name
new 9b328a6 Skip setting attribute that is neither supported nor required for APR
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/org/apache/catalina/connector/TestInputBuffer.java | 3 +--
test/org/apache/catalina/connector/TestKeepAliveCount.java | 6 +++---
test/org/apache/catalina/connector/TestMaxConnections.java | 13 ++++++-------
.../org/apache/catalina/core/TestSwallowAbortedUploads.java | 4 ++--
.../org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 4 ++--
test/org/apache/coyote/TestCompressionConfig.java | 1 -
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 12 ++++++------
test/org/apache/coyote/http11/TestHttp11InputBuffer.java | 6 +++---
test/org/apache/coyote/http11/TestHttp11Processor.java | 4 ++--
.../coyote/http11/filters/TestChunkedInputFilter.java | 8 ++++----
.../coyote/http11/upgrade/TestUpgradeInternalHandler.java | 2 +-
.../apache/tomcat/util/http/TestMimeHeadersIntegration.java | 4 ++--
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 4 ++--
test/org/apache/tomcat/util/net/TestCustomSsl.java | 12 ++++++------
.../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 7 +++++--
test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 2 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 8 +++++---
.../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 3 ++-
18 files changed, 53 insertions(+), 50 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/07: Check that uses of Connector.setProperty() in tests
complete correctly
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 200d15ae5b1150b46ca1e1400fe9d2d0ba10d9d3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:44:40 2020 +0000
Check that uses of Connector.setProperty() in tests complete correctly
---
test/org/apache/catalina/connector/TestInputBuffer.java | 4 ++--
test/org/apache/catalina/connector/TestKeepAliveCount.java | 6 +++---
test/org/apache/catalina/connector/TestMaxConnections.java | 13 ++++++-------
.../org/apache/catalina/core/TestSwallowAbortedUploads.java | 4 ++--
.../org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 4 ++--
test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 12 ++++++------
test/org/apache/coyote/http11/TestHttp11InputBuffer.java | 6 +++---
test/org/apache/coyote/http11/TestHttp11Processor.java | 4 ++--
.../coyote/http11/filters/TestChunkedInputFilter.java | 8 ++++----
.../coyote/http11/upgrade/TestUpgradeInternalHandler.java | 2 +-
.../apache/tomcat/util/http/TestMimeHeadersIntegration.java | 4 ++--
test/org/apache/tomcat/util/net/TestClientCertTls13.java | 4 ++--
test/org/apache/tomcat/util/net/TestCustomSsl.java | 12 ++++++------
.../org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 4 ++--
test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 2 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 8 +++++---
.../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 3 ++-
17 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java b/test/org/apache/catalina/connector/TestInputBuffer.java
index 1576bec..55822f3 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,7 @@ public class TestInputBuffer extends TomcatBaseTest {
Tomcat.addServlet(root, "Echo", new Utf8Echo());
root.addServletMappingDecoded("/test", "Echo");
- tomcat.getConnector().setProperty("soTimeout", "300000");
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "300000"));
tomcat.start();
for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
@@ -68,7 +68,7 @@ public class TestInputBuffer extends TomcatBaseTest {
Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
root.addServletMappingDecoded("/", "Bug60400Servlet");
- tomcat.getConnector().setProperty("appReadBufSize", "9000");
+ Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", "9000"));
tomcat.start();
ByteChunk bc = new ByteChunk();
diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 8e40986..130b360 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -58,9 +58,9 @@ public class TestKeepAliveCount extends TomcatBaseTest {
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
root.addServletMappingDecoded("/test", "Simple");
- tomcat.getConnector().setProperty("maxKeepAliveRequests", "5");
- tomcat.getConnector().setProperty("soTimeout", "20000");
- tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", "5"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
init = true;
}
diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java b/test/org/apache/catalina/connector/TestMaxConnections.java
index 541ea05..ea55ea4 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -74,13 +74,12 @@ public class TestMaxConnections extends TomcatBaseTest {
root.setUnloadDelay(soTimeout);
Tomcat.addServlet(root, "Simple", new SimpleServlet());
root.addServletMappingDecoded("/test", "Simple");
- tomcat.getConnector().setProperty("maxKeepAliveRequests", "1");
- tomcat.getConnector().setProperty("maxThreads", "10");
- tomcat.getConnector().setProperty("soTimeout", "20000");
- tomcat.getConnector().setProperty("keepAliveTimeout", "50000");
- tomcat.getConnector().setProperty(
- "maxConnections", Integer.toString(MAX_CONNECTIONS));
- tomcat.getConnector().setProperty("acceptCount", "1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", "1"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", "10"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", Integer.toString(MAX_CONNECTIONS)));
+ Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", "1"));
tomcat.start();
}
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index 84431da..a90d4a6 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -255,7 +255,7 @@ public class TestSwallowAbortedUploads extends TomcatBaseTest {
Connector c = tomcat.getConnector();
c.setMaxPostSize(2 * hugeSize);
- c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+ Assert.assertTrue(c.setProperty("maxSwallowSize", Integer.toString(hugeSize)));
tomcat.start();
setPort(c.getLocalPort());
@@ -367,7 +367,7 @@ public class TestSwallowAbortedUploads extends TomcatBaseTest {
Connector c = tomcat.getConnector();
c.setMaxPostSize(2 * hugeSize);
- c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+ Assert.assertTrue(c.setProperty("maxSwallowSize", Integer.toString(hugeSize)));
setPort(c.getLocalPort());
}
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 574294f..4c2435d 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -161,7 +161,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
// Note: Low values of socket.txBufSize can trigger very poor
// performance. Set it just low enough to ensure that the
// non-blocking write servlet will see isReady() == false
- tomcat.getConnector().setProperty("socket.txBufSize", "1048576");
+ Assert.assertTrue(tomcat.getConnector().setProperty("socket.txBufSize", "1048576"));
tomcat.start();
SocketFactory factory = SocketFactory.getDefault();
@@ -330,7 +330,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
// Note: Low values of socket.txBufSize can trigger very poor
// performance. Set it just low enough to ensure that the
// non-blocking write servlet will see isReady() == false
- tomcat.getConnector().setProperty("socket.txBufSize", "1048576");
+ Assert.assertTrue(tomcat.getConnector().setProperty("socket.txBufSize", "1048576"));
tomcat.start();
SocketFactory factory = SocketFactory.getDefault();
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index fc21da1..d145911 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -76,7 +76,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
Map<String, String> params = desc.getParams();
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize));
+ Assert.assertTrue(tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -193,13 +193,13 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
case "REQUEST-REMOTE-USER":
/* request.getRemoteUser() will not trust the AJP
* info if tomcatAuthentication is set. */
- tomcat.getConnector().setProperty("tomcatAuthentication", "false");
+ Assert.assertTrue(tomcat.getConnector().setProperty("tomcatAuthentication", "false"));
forwardMessage.addAttribute(0x03, value);
break;
case "REQUEST-AUTH-TYPE":
/* request.getAuthType() will not trust the AJP
* info if tomcatAuthentication is set. */
- tomcat.getConnector().setProperty("tomcatAuthentication", "false");
+ Assert.assertTrue(tomcat.getConnector().setProperty("tomcatAuthentication", "false"));
forwardMessage.addAttribute(0x04, value);
break;
case "REQUEST-QUERY-STRING":
@@ -490,7 +490,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
@Test
public void testSecret() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET");
+ Assert.assertTrue(tomcat.getConnector().setProperty("requiredSecret", "RIGHTSECRET"));
tomcat.start();
// No file system docBase required
@@ -550,7 +550,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
@Test
public void testKeepAlive() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("connectionTimeout", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "-1"));
tomcat.start();
// No file system docBase required
@@ -771,7 +771,7 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
int ajpPacketSize = 16000;
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize));
+ Assert.assertTrue(tomcat.getConnector().setProperty("packetSize", Integer.toString(ajpPacketSize)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
index 245413b..61d6d60 100644
--- a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
+++ b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
@@ -273,8 +273,8 @@ public class TestHttp11InputBuffer extends TomcatBaseTest {
try {
Connector connector = tomcat.getConnector();
- connector.setProperty("rejectIllegalHeaderName",
- Boolean.toString(rejectIllegalHeaderName));
+ Assert.assertTrue(connector.setProperty(
+ "rejectIllegalHeaderName", Boolean.toString(rejectIllegalHeaderName)));
tomcat.start();
setPort(connector.getLocalPort());
@@ -548,7 +548,7 @@ public class TestHttp11InputBuffer extends TomcatBaseTest {
try {
Connector connector = tomcat.getConnector();
- connector.setProperty("rejectIllegalHeaderName", "false");
+ Assert.assertTrue(connector.setProperty("rejectIllegalHeaderName", "false"));
tomcat.start();
setPort(connector.getLocalPort());
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 1a57bb1..cbbc89e 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -480,8 +480,8 @@ public class TestHttp11Processor extends TomcatBaseTest {
@Test
public void testBug55772() throws Exception {
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("processorCache", "1");
- tomcat.getConnector().setProperty("maxThreads", "1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("processorCache", "1"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", "1"));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 93912f0..fbdfb99 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -101,7 +101,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
Context ctx = tomcat.addContext("", null);
// Configure allowed trailer headers
- tomcat.getConnector().setProperty("allowedTrailerHeaders", "x-trailer1,x-trailer2");
+ Assert.assertTrue(tomcat.getConnector().setProperty("allowedTrailerHeaders", "x-trailer1,x-trailer2"));
EchoHeaderServlet servlet = new EchoHeaderServlet(expectPass);
Tomcat.addServlet(ctx, "servlet", servlet);
@@ -170,7 +170,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
ctx.addServletMappingDecoded("/", "servlet");
// Limit the size of the trailing header
- tomcat.getConnector().setProperty("maxTrailerSize", "10");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxTrailerSize", "10"));
tomcat.start();
String[] request = new String[]{
@@ -223,8 +223,8 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty(
- "maxExtensionSize", Integer.toString(EXT_SIZE_LIMIT));
+ Assert.assertTrue(tomcat.getConnector().setProperty(
+ "maxExtensionSize", Integer.toString(EXT_SIZE_LIMIT)));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index c1b3ef0..9c9421c 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -88,7 +88,7 @@ public class TestUpgradeInternalHandler extends TomcatBaseTest {
Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws Exception {
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
- tomcat.getConnector().setProperty("useAsyncIO", "true");
+ Assert.assertTrue(tomcat.getConnector().setProperty("useAsyncIO", "true"));
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
index 75cc8f8..b91fede 100644
--- a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
+++ b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
@@ -122,7 +122,7 @@ public class TestMimeHeadersIntegration extends TomcatBaseTest {
// Bumping into maxHttpHeaderSize
Tomcat tomcat = getTomcatInstance();
setupHeadersTest(tomcat);
- tomcat.getConnector().setProperty("maxHeaderCount", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxHeaderCount", "-1"));
runHeadersTest(false, tomcat, 8 * 1024, -1);
}
@@ -147,7 +147,7 @@ public class TestMimeHeadersIntegration extends TomcatBaseTest {
// Can change maxHeaderCount
Tomcat tomcat = getTomcatInstance();
setupHeadersTest(tomcat);
- tomcat.getConnector().setProperty("maxHeaderCount", "-1");
+ Assert.assertTrue(tomcat.getConnector().setProperty("maxHeaderCount", "-1"));
runHeadersTest(true, tomcat, 300, -1);
}
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index fe8d8da..19f2e5e 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -75,9 +75,9 @@ public class TestClientCertTls13 extends TomcatBaseTest {
TesterSupport.configureClientCertContext(tomcat);
// Need to override some of the previous settings
- tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_3);
+ Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_3));
// And add force authentication to occur on the initial handshake
- tomcat.getConnector().setProperty("clientAuth", "required");
+ Assert.assertTrue(tomcat.getConnector().setProperty("clientAuth", "required"));
TesterSupport.configureClientSsl();
}
diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java
index 970229a..60dbf00 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -59,15 +59,15 @@ public class TestCustomSsl extends TomcatBaseTest {
Assume.assumeFalse("This test is only for JSSE based SSL connectors",
connector.getProtocolHandlerClassName().contains("Apr"));
- connector.setProperty("sslImplementationName",
- "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
+ Assert.assertTrue(connector.setProperty(
+ "sslImplementationName", "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"));
// This setting will break ssl configuration unless the custom
// implementation is used.
- connector.setProperty(TesterBug50640SslImpl.PROPERTY_NAME,
- TesterBug50640SslImpl.PROPERTY_VALUE);
+ Assert.assertTrue(connector.setProperty(
+ TesterBug50640SslImpl.PROPERTY_NAME, TesterBug50640SslImpl.PROPERTY_VALUE));
- connector.setProperty("sslProtocol", "tls");
+ Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
File keystoreFile =
new File(TesterSupport.LOCALHOST_RSA_JKS);
@@ -75,7 +75,7 @@ public class TestCustomSsl extends TomcatBaseTest {
"keystoreFile", keystoreFile.getAbsolutePath());
connector.setSecure(true);
- connector.setProperty("SSLEnabled", "true");
+ Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
File appDir = new File(getBuildDirectory(), "webapps/examples");
Context ctxt = tomcat.addWebapp(
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 42029bf..90c160f 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -322,8 +322,8 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
connector.setPort(0);
connector.setScheme("https");
connector.setSecure(true);
- connector.setProperty("SSLEnabled", "true");
- connector.setProperty("sslImplementationName", sslImplementationName);
+ Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
+ Assert.assertTrue(connector.setProperty("sslImplementationName", sslImplementationName));
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 00d6bb5..ab08bf7 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -155,7 +155,7 @@ public class TestXxxEndpoint extends TomcatBaseTest {
public void testStartStopBindOnStart() throws Exception {
Tomcat tomcat = getTomcatInstance();
Connector c = tomcat.getConnector();
- c.setProperty("bindOnInit", "false");
+ Assert.assertTrue(c.setProperty("bindOnInit", "false"));
File appDir = new File(getBuildDirectory(), "webapps/examples");
tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java
index e0ceda1..49b8de7 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -48,6 +48,8 @@ import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import org.junit.Assert;
+
import org.apache.catalina.Context;
import org.apache.catalina.authenticator.SSLAuthenticator;
import org.apache.catalina.connector.Connector;
@@ -146,7 +148,7 @@ public final class TesterSupport {
server.addLifecycleListener(listener);
tomcat.getConnector().setAttribute("sslImplementationName", sslImplementation);
}
- connector.setProperty("sslProtocol", "tls");
+ Assert.assertTrue(connector.setProperty("sslProtocol", "tls"));
File keystoreFile =
new File(keystore);
connector.setAttribute("keystoreFile",
@@ -175,7 +177,7 @@ public final class TesterSupport {
keystoreFile.getAbsolutePath());
}
tomcat.getConnector().setSecure(true);
- tomcat.getConnector().setProperty("SSLEnabled", "true");
+ Assert.assertTrue(tomcat.getConnector().setProperty("SSLEnabled", "true"));
}
protected static KeyManager[] getUser1KeyManagers() throws Exception {
@@ -264,7 +266,7 @@ public final class TesterSupport {
* depend. Therefore, force these tests to use TLSv1.2 so that they pass
* when running on TLSv1.3.
*/
- tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_2);
+ Assert.assertTrue(tomcat.getConnector().setProperty("sslEnabledProtocols", Constants.SSL_PROTO_TLSv1_2));
// Need a web application with a protected and unprotected URL
// No file system docBase required
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index e1d5535..64bb5a7 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.websocket;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -38,7 +39,7 @@ public class TestWsWebSocketContainerWithProxy extends TestWsWebSocketContainer
// With httpd 2.2, AllowCONNECT requires fixed ports. From 2.4, a range
// can be used.
getTomcatInstance().getConnector().setPort(8080);
- getTomcatInstance().getConnector().setProperty("address","0.0.0.0");
+ Assert.assertTrue(getTomcatInstance().getConnector().setProperty("address","0.0.0.0"));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 07/07: Skip setting attribute that is neither supported
nor required for APR
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9b328a648cbcd1e2a982710465e347003e32c96b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 12:01:45 2020 +0000
Skip setting attribute that is neither supported nor required for APR
---
test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 90c160f..e098b54 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -323,7 +323,10 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
connector.setScheme("https");
connector.setSecure(true);
Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
- Assert.assertTrue(connector.setProperty("sslImplementationName", sslImplementationName));
+ if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+ // Skip this for APR. It is not supported.
+ Assert.assertTrue(connector.setProperty("sslImplementationName", sslImplementationName));
+ }
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/07: Remove @SuppressWarnings that is now unnecessary
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fa1e9cee22e4314b55509fb04d369087793ab22d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:24:14 2020 +0000
Remove @SuppressWarnings that is now unnecessary
---
test/org/apache/coyote/TestCompressionConfig.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/org/apache/coyote/TestCompressionConfig.java b/test/org/apache/coyote/TestCompressionConfig.java
index b266c7a..f5dc037 100644
--- a/test/org/apache/coyote/TestCompressionConfig.java
+++ b/test/org/apache/coyote/TestCompressionConfig.java
@@ -54,7 +54,6 @@ public class TestCompressionConfig {
@Parameter(2)
public Boolean compress;
- @SuppressWarnings("deprecation")
@Test
public void testUseCompression() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/07: Correct property name
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4c91d860c654b0746eede25df822d30c0c5a5583
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:45:04 2020 +0000
Correct property name
---
test/org/apache/catalina/connector/TestInputBuffer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java b/test/org/apache/catalina/connector/TestInputBuffer.java
index bb2d708..d345bc3 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -67,7 +67,7 @@ public class TestInputBuffer extends TomcatBaseTest {
Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
root.addServletMappingDecoded("/", "Bug60400Servlet");
- Assert.assertTrue(tomcat.getConnector().setProperty("appReadBufSize", "9000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("socket.appReadBufSize", "9000"));
tomcat.start();
ByteChunk bc = new ByteChunk();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/07: Remove debug code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e6127effe4c4b7c819849bbcd35ee79586ad291c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:44:52 2020 +0000
Remove debug code
---
test/org/apache/catalina/connector/TestInputBuffer.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestInputBuffer.java b/test/org/apache/catalina/connector/TestInputBuffer.java
index 55822f3..bb2d708 100644
--- a/test/org/apache/catalina/connector/TestInputBuffer.java
+++ b/test/org/apache/catalina/connector/TestInputBuffer.java
@@ -48,7 +48,6 @@ public class TestInputBuffer extends TomcatBaseTest {
Tomcat.addServlet(root, "Echo", new Utf8Echo());
root.addServletMappingDecoded("/test", "Echo");
- Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "300000"));
tomcat.start();
for (Utf8TestCase testCase : TestUtf8.TEST_CASES) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/07: Correct property name
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5e546d01ea946509f38d5cb68ed0b6283e1172fc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:45:52 2020 +0000
Correct property name
---
test/org/apache/catalina/connector/TestKeepAliveCount.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java b/test/org/apache/catalina/connector/TestKeepAliveCount.java
index 130b360..c27c5c1 100644
--- a/test/org/apache/catalina/connector/TestKeepAliveCount.java
+++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java
@@ -59,7 +59,7 @@ public class TestKeepAliveCount extends TomcatBaseTest {
Tomcat.addServlet(root, "Simple", new SimpleServlet());
root.addServletMappingDecoded("/test", "Simple");
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", "5"));
- Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "20000"));
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
init = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/07: Correct property name
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ba8730a83d5a8a10b6daee852c868cdda3f4fb22
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 11:47:12 2020 +0000
Correct property name
---
test/org/apache/catalina/connector/TestMaxConnections.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java b/test/org/apache/catalina/connector/TestMaxConnections.java
index ea55ea4..833b9e9 100644
--- a/test/org/apache/catalina/connector/TestMaxConnections.java
+++ b/test/org/apache/catalina/connector/TestMaxConnections.java
@@ -76,7 +76,7 @@ public class TestMaxConnections extends TomcatBaseTest {
root.addServletMappingDecoded("/test", "Simple");
Assert.assertTrue(tomcat.getConnector().setProperty("maxKeepAliveRequests", "1"));
Assert.assertTrue(tomcat.getConnector().setProperty("maxThreads", "10"));
- Assert.assertTrue(tomcat.getConnector().setProperty("soTimeout", "20000"));
+ Assert.assertTrue(tomcat.getConnector().setProperty("connectionTimeout", "20000"));
Assert.assertTrue(tomcat.getConnector().setProperty("keepAliveTimeout", "50000"));
Assert.assertTrue(tomcat.getConnector().setProperty("maxConnections", Integer.toString(MAX_CONNECTIONS)));
Assert.assertTrue(tomcat.getConnector().setProperty("acceptCount", "1"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org