This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d42e567794f86e409ae43e74a926b00445c82f1b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 11 11:30:49 2019 +0100
Refactor definition of boolean array to reduce code duplication
---
test/javax/servlet/http/TestHttpServletResponseSendError.java | 2 --
test/org/apache/catalina/servlets/TestDefaultServletOptions.java | 1 -
test/org/apache/catalina/servlets/TestWebdavServletOptions.java | 1 -
test/org/apache/catalina/startup/TomcatBaseTest.java | 3 +++
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java
b/test/javax/servlet/http/TestHttpServletResponseSendError.java
index 8e0e89e..b4865e9 100644
--- a/test/javax/servlet/http/TestHttpServletResponseSendError.java
+++ b/test/javax/servlet/http/TestHttpServletResponseSendError.java
@@ -59,8 +59,6 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
* - dispatch
*/
- private static final Boolean[] booleans = new Boolean[] { Boolean.FALSE,
Boolean.TRUE };
-
private enum AsyncErrorPoint {
/*
* Thread A is the container thread the processes the original request.
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
index 8db6c90..b7708b8 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
@@ -31,7 +31,6 @@ public class TestDefaultServletOptions extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
- Boolean[] booleans = new Boolean[] { Boolean.FALSE, Boolean.TRUE };
String[] urls = new String[] { COLLECTION_NAME, FILE_NAME,
UNKNOWN_NAME };
String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE" };
diff --git a/test/org/apache/catalina/servlets/TestWebdavServletOptions.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptions.java
index e55aeed..4407f6c 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptions.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptions.java
@@ -31,7 +31,6 @@ public class TestWebdavServletOptions extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
- Boolean[] booleans = new Boolean[] { Boolean.FALSE, Boolean.TRUE };
String[] urls = new String[] { COLLECTION_NAME, FILE_NAME,
UNKNOWN_NAME };
String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE",
"MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND",
"PROPPATCH" };
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 0b77e9f..e234d67 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -61,6 +61,9 @@ import org.apache.tomcat.util.buf.ByteChunk;
*/
public abstract class TomcatBaseTest extends LoggingBaseTest {
+ // Used by parameterized tests. Defined here to reduce duplication.
+ protected static final Boolean[] booleans = new Boolean[] { Boolean.FALSE,
Boolean.TRUE };
+
protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300000;
public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
