This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 33e951c25473d858c1367957c1bfb746c78c8f73
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 --
.../apache/catalina/servlets/DefaultServletEncodingBaseTest.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 | 8 ++++++--
test/org/apache/coyote/http2/TestAsync.java | 1 -
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java
b/test/javax/servlet/http/TestHttpServletResponseSendError.java
index 256b536..bfdbf7e 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/DefaultServletEncodingBaseTest.java
b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
index 6ff4849..6640494 100644
--- a/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
+++ b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
@@ -67,8 +67,6 @@ public abstract class DefaultServletEncodingBaseTest extends
TomcatBaseTest {
String[] targetFiles = new String[] {
"cp1252", "ibm850", "iso-8859-1", "utf-8-bom", "utf-8" };
- Boolean[] booleans = new Boolean[] { Boolean.FALSE, Boolean.TRUE };
-
List<Object[]> parameterSets = new ArrayList<>();
for (String contextResponseEncoding : encodings) {
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
index 98e0829..f4e0f55 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 ed8b776..2ccbbb9 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 0fd2286..b7c5fb4 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -83,12 +83,16 @@ public abstract class TomcatBaseTest extends
LoggingBaseTest {
@SuppressWarnings("unused")
private static final boolean ignored = TesterSupport.OPENSSL_AVAILABLE;
- private Tomcat tomcat;
- private boolean accessLogEnabled = false;
+ // 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 = 300_000;
public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+ private Tomcat tomcat;
+ private boolean accessLogEnabled = false;
+
/**
* Make the Tomcat instance available to sub-classes.
*
diff --git a/test/org/apache/coyote/http2/TestAsync.java
b/test/org/apache/coyote/http2/TestAsync.java
index cc74468..83c46ab 100644
--- a/test/org/apache/coyote/http2/TestAsync.java
+++ b/test/org/apache/coyote/http2/TestAsync.java
@@ -58,7 +58,6 @@ public class TestAsync extends Http2TestBase {
"connectionUnlimited[{1}], streamUnlimited[{2}],
useNonContainerThreadForWrite[{3}]," +
"largeInitialWindow[{4}]")
public static Collection<Object[]> parameters() {
- Boolean[] booleans = new Boolean[] { Boolean.FALSE, Boolean.TRUE };
List<Object[]> parameterSets = new ArrayList<>();
for (Boolean expandConnectionFirst : booleans) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
