This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new ac361300f4 Code clean-up - formatting. No fumctional change.
ac361300f4 is described below
commit ac361300f42f2c69edf2abc056c59800b90ef9cb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 29 18:11:49 2025 +0100
Code clean-up - formatting. No fumctional change.
---
.../servlet/TestServletRequestParameters.java | 2 +-
.../TestServletRequestParametersQueryString.java | 10 +--
test/jakarta/servlet/http/TestCookie.java | 8 +--
test/jakarta/servlet/http/TestHttpServlet.java | 65 ++++++++-----------
...tHttpServletDoHeadInvalidWrite0ValidWrite0.java | 5 +-
...tHttpServletDoHeadInvalidWrite0ValidWrite1.java | 5 +-
...tpServletDoHeadInvalidWrite0ValidWrite1023.java | 5 +-
...tpServletDoHeadInvalidWrite0ValidWrite1024.java | 5 +-
...tpServletDoHeadInvalidWrite0ValidWrite1025.java | 5 +-
...ttpServletDoHeadInvalidWrite0ValidWrite511.java | 5 +-
...ttpServletDoHeadInvalidWrite0ValidWrite512.java | 5 +-
...ttpServletDoHeadInvalidWrite0ValidWrite513.java | 5 +-
...tpServletDoHeadInvalidWrite1023ValidWrite0.java | 5 +-
...tpServletDoHeadInvalidWrite1023ValidWrite1.java | 5 +-
...ervletDoHeadInvalidWrite1023ValidWrite1023.java | 5 +-
...ervletDoHeadInvalidWrite1023ValidWrite1024.java | 5 +-
...ervletDoHeadInvalidWrite1023ValidWrite1025.java | 5 +-
...ServletDoHeadInvalidWrite1023ValidWrite511.java | 5 +-
...ServletDoHeadInvalidWrite1023ValidWrite512.java | 5 +-
...ServletDoHeadInvalidWrite1023ValidWrite513.java | 5 +-
...tpServletDoHeadInvalidWrite1024ValidWrite0.java | 5 +-
...tpServletDoHeadInvalidWrite1024ValidWrite1.java | 5 +-
...ervletDoHeadInvalidWrite1024ValidWrite1023.java | 5 +-
...ervletDoHeadInvalidWrite1024ValidWrite1024.java | 5 +-
...ervletDoHeadInvalidWrite1024ValidWrite1025.java | 5 +-
...ServletDoHeadInvalidWrite1024ValidWrite511.java | 5 +-
...ServletDoHeadInvalidWrite1024ValidWrite512.java | 5 +-
...ServletDoHeadInvalidWrite1024ValidWrite513.java | 5 +-
...tpServletDoHeadInvalidWrite1025ValidWrite0.java | 5 +-
...tpServletDoHeadInvalidWrite1025ValidWrite1.java | 5 +-
...ervletDoHeadInvalidWrite1025ValidWrite1023.java | 5 +-
...ervletDoHeadInvalidWrite1025ValidWrite1024.java | 5 +-
...ervletDoHeadInvalidWrite1025ValidWrite1025.java | 5 +-
...ServletDoHeadInvalidWrite1025ValidWrite511.java | 5 +-
...ServletDoHeadInvalidWrite1025ValidWrite512.java | 5 +-
...ServletDoHeadInvalidWrite1025ValidWrite513.java | 5 +-
...tHttpServletDoHeadInvalidWrite1ValidWrite0.java | 5 +-
...tHttpServletDoHeadInvalidWrite1ValidWrite1.java | 5 +-
...tpServletDoHeadInvalidWrite1ValidWrite1023.java | 5 +-
...tpServletDoHeadInvalidWrite1ValidWrite1024.java | 5 +-
...tpServletDoHeadInvalidWrite1ValidWrite1025.java | 5 +-
...ttpServletDoHeadInvalidWrite1ValidWrite511.java | 5 +-
...ttpServletDoHeadInvalidWrite1ValidWrite512.java | 5 +-
...ttpServletDoHeadInvalidWrite1ValidWrite513.java | 5 +-
...ttpServletDoHeadInvalidWrite511ValidWrite0.java | 5 +-
...ttpServletDoHeadInvalidWrite511ValidWrite1.java | 5 +-
...ServletDoHeadInvalidWrite511ValidWrite1023.java | 5 +-
...ServletDoHeadInvalidWrite511ValidWrite1024.java | 5 +-
...ServletDoHeadInvalidWrite511ValidWrite1025.java | 5 +-
...pServletDoHeadInvalidWrite511ValidWrite511.java | 5 +-
...pServletDoHeadInvalidWrite511ValidWrite512.java | 5 +-
...pServletDoHeadInvalidWrite511ValidWrite513.java | 5 +-
...ttpServletDoHeadInvalidWrite512ValidWrite0.java | 5 +-
...ttpServletDoHeadInvalidWrite512ValidWrite1.java | 5 +-
...ServletDoHeadInvalidWrite512ValidWrite1023.java | 5 +-
...ServletDoHeadInvalidWrite512ValidWrite1024.java | 5 +-
...ServletDoHeadInvalidWrite512ValidWrite1025.java | 5 +-
...pServletDoHeadInvalidWrite512ValidWrite511.java | 5 +-
...pServletDoHeadInvalidWrite512ValidWrite512.java | 5 +-
...pServletDoHeadInvalidWrite512ValidWrite513.java | 5 +-
...ttpServletDoHeadInvalidWrite513ValidWrite0.java | 5 +-
...ttpServletDoHeadInvalidWrite513ValidWrite1.java | 5 +-
...ServletDoHeadInvalidWrite513ValidWrite1023.java | 5 +-
...ServletDoHeadInvalidWrite513ValidWrite1024.java | 5 +-
...ServletDoHeadInvalidWrite513ValidWrite1025.java | 5 +-
...pServletDoHeadInvalidWrite513ValidWrite511.java | 5 +-
...pServletDoHeadInvalidWrite513ValidWrite512.java | 5 +-
...pServletDoHeadInvalidWrite513ValidWrite513.java | 5 +-
.../http/TestHttpServletResponseSendError.java | 46 ++++++--------
.../servlet/http/TesterHttpServletPerformance.java | 2 +-
test/jakarta/servlet/jsp/TestPageContext.java | 3 +-
test/jakarta/servlet/jsp/TesterPageContext.java | 18 ++----
.../jsp/TesterPageContextWithAttributes.java | 74 +++++++++++-----------
.../jsp/el/TestScopedAttributeELResolver.java | 3 +-
...TesterScopedAttributeELResolverPerformance.java | 3 +-
.../servlet/resources/TestSchemaValidation.java | 66 +++++++------------
.../TesterContainerProviderPerformance.java | 3 +-
77 files changed, 253 insertions(+), 370 deletions(-)
diff --git a/test/jakarta/servlet/TestServletRequestParameters.java
b/test/jakarta/servlet/TestServletRequestParameters.java
index c89359ccb4..765beb5191 100644
--- a/test/jakarta/servlet/TestServletRequestParameters.java
+++ b/test/jakarta/servlet/TestServletRequestParameters.java
@@ -74,7 +74,7 @@ public class TestServletRequestParameters extends
ServletRequestParametersBaseTe
}
// Connection should be closed by the server.
- //readLine() will receive an EOF reading the status line resulting in
a null
+ // readLine() will receive an EOF reading the status line resulting in
a null
Assert.assertNull(client.getResponseLine());
}
}
diff --git a/test/jakarta/servlet/TestServletRequestParametersQueryString.java
b/test/jakarta/servlet/TestServletRequestParametersQueryString.java
index ec4f558189..7c07a86c38 100644
--- a/test/jakarta/servlet/TestServletRequestParametersQueryString.java
+++ b/test/jakarta/servlet/TestServletRequestParametersQueryString.java
@@ -47,21 +47,21 @@ public class TestServletRequestParametersQueryString
extends ServletRequestParam
List<Object[]> parameterSets = new ArrayList<>();
// Empty parameter
- parameterSets.add(new Object[] { "before=aaa&&after=zzz", SC_OK, TWO}
);
+ parameterSets.add(new Object[] { "before=aaa&&after=zzz", SC_OK, TWO
});
// Invalid parameter
- parameterSets.add(new Object[] { "before=aaa&=value&after=zzz",
SC_BAD_REQUEST, ZERO} );
+ parameterSets.add(new Object[] { "before=aaa&=value&after=zzz",
SC_BAD_REQUEST, ZERO });
// Invalid %nn encoding
- parameterSets.add(new Object[] { "before=aaa&test=val%GGue&after=zzz",
SC_BAD_REQUEST, ZERO} );
+ parameterSets.add(new Object[] { "before=aaa&test=val%GGue&after=zzz",
SC_BAD_REQUEST, ZERO });
// Invalid UTF-8 byte
- parameterSets.add(new Object[] { "before=aaa&test=val%FFue&after=zzz",
SC_BAD_REQUEST, ZERO} );
+ parameterSets.add(new Object[] { "before=aaa&test=val%FFue&after=zzz",
SC_BAD_REQUEST, ZERO });
// There are no unmappable UTF-8 code points
// Too many parameters
- parameterSets.add(new Object[] {
"before=aaa&test=value&after=zzz&extra=yyy", SC_BAD_REQUEST, ZERO} );
+ parameterSets.add(new Object[] {
"before=aaa&test=value&after=zzz&extra=yyy", SC_BAD_REQUEST, ZERO });
return parameterSets;
}
diff --git a/test/jakarta/servlet/http/TestCookie.java
b/test/jakarta/servlet/http/TestCookie.java
index a6ec8f758c..a4def48a9e 100644
--- a/test/jakarta/servlet/http/TestCookie.java
+++ b/test/jakarta/servlet/http/TestCookie.java
@@ -25,8 +25,8 @@ import org.junit.Test;
* Basic tests for Cookie in default configuration.
*/
public class TestCookie {
- public static final BitSet CHAR; // <any US-ASCII character (octets 0 -
127)>
- public static final BitSet CTL; // <any US-ASCII control character
(octets 0 - 31) and DEL (127)>
+ public static final BitSet CHAR; // <any US-ASCII character (octets 0 -
127)>
+ public static final BitSet CTL; // <any US-ASCII control character (octets
0 - 31) and DEL (127)>
public static final BitSet SEPARATORS;
public static final BitSet TOKEN; // 1*<any CHAR except CTLs or separators>
@@ -141,7 +141,7 @@ public class TestCookie {
Cookie cookie = new Cookie("name", "value");
Assert.assertEquals(-1, cookie.getMaxAge());
- for (int value : new int[] { Integer.MIN_VALUE, -2, -1, 0, 1, 2,
Integer.MAX_VALUE}) {
+ for (int value : new int[] { Integer.MIN_VALUE, -2, -1, 0, 1, 2,
Integer.MAX_VALUE }) {
cookie.setMaxAge(value);
Assert.assertEquals(value, cookie.getMaxAge());
}
@@ -206,7 +206,7 @@ public class TestCookie {
@Test
public void testClone() {
- Cookie a = new Cookie("a","a");
+ Cookie a = new Cookie("a", "a");
a.setDomain("domain");
a.setHttpOnly(true);
a.setMaxAge(123);
diff --git a/test/jakarta/servlet/http/TestHttpServlet.java
b/test/jakarta/servlet/http/TestHttpServlet.java
index e79a5507b6..bf168cff95 100644
--- a/test/jakarta/servlet/http/TestHttpServlet.java
+++ b/test/jakarta/servlet/http/TestHttpServlet.java
@@ -60,9 +60,8 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
- Map<String,List<String>> resHeaders= new HashMap<>();
- int rc = headUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(),
- resHeaders);
+ Map<String,List<String>> resHeaders = new HashMap<>();
+ int rc = headUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(), resHeaders);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
Assert.assertEquals(LargeBodyServlet.RESPONSE_LENGTH,
resHeaders.get("Content-Length").get(0));
@@ -75,16 +74,15 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final String RESPONSE_LENGTH = "12345678901";
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setHeader("content-length", RESPONSE_LENGTH);
}
}
/*
- * Verifies that the same Content-Length is returned for both GET and HEAD
- * operations when a Servlet includes content from another Servlet
+ * Verifies that the same Content-Length is returned for both GET and HEAD
operations when a Servlet includes
+ * content from another Servlet
*/
@Test
public void testBug57602() throws Exception {
@@ -103,7 +101,7 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
- Map<String,List<String>> resHeaders= new CaseInsensitiveKeyMap<>();
+ Map<String,List<String>> resHeaders = new CaseInsensitiveKeyMap<>();
String path = "http://localhost:"; + getPort() + "/outer";
ByteChunk out = new ByteChunk();
@@ -199,7 +197,7 @@ public class TestHttpServlet extends TomcatBaseTest {
// Headers should be the same (apart from Date)
Assert.assertEquals(getHeaders.size(), headHeaders.size());
- for (Map.Entry<String, List<String>> getHeader :
getHeaders.entrySet()) {
+ for (Map.Entry<String,List<String>> getHeader : getHeaders.entrySet())
{
String headerName = getHeader.getKey();
Assert.assertTrue(headerName, headHeaders.containsKey(headerName));
List<String> getValues = getHeader.getValue();
@@ -226,7 +224,7 @@ public class TestHttpServlet extends TomcatBaseTest {
}
- private void doTestDoOptions(Servlet servlet, String expectedAllow) throws
Exception{
+ private void doTestDoOptions(Servlet servlet, String expectedAllow) throws
Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -238,9 +236,9 @@ public class TestHttpServlet extends TomcatBaseTest {
tomcat.start();
- Map<String,List<String>> resHeaders= new HashMap<>();
- int rc = methodUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(),
- DEFAULT_CLIENT_TIMEOUT_MS, null, resHeaders, "OPTIONS");
+ Map<String,List<String>> resHeaders = new HashMap<>();
+ int rc = methodUrl("http://localhost:"; + getPort() + "/", new
ByteChunk(), DEFAULT_CLIENT_TIMEOUT_MS, null,
+ resHeaders, "OPTIONS");
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
Assert.assertEquals(expectedAllow, resHeaders.get("Allow").get(0));
@@ -266,9 +264,8 @@ public class TestHttpServlet extends TomcatBaseTest {
/*
- * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
- * this test. It was placed in that package because it needed access to
- * package private classes.
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
this test. It was placed in that package
+ * because it needed access to package private classes.
*/
@@ -296,7 +293,7 @@ public class TestHttpServlet extends TomcatBaseTest {
client.doRequest();
if (isHttp09) {
- Assert.assertTrue( client.getResponseBody(),
client.getResponseBody().contains(" 400 "));
+ Assert.assertTrue(client.getResponseBody(),
client.getResponseBody().contains(" 400 "));
} else if (isHttp10) {
Assert.assertTrue(client.getResponseLine(),
client.isResponse400());
} else {
@@ -369,7 +366,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private class Client extends SimpleHttpClient {
Client(String request, boolean isHttp09) {
- setRequest(new String[] {request});
+ setRequest(new String[] { request });
setUseHttp09(isHttp09);
}
@@ -412,8 +409,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
@@ -429,8 +425,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
@@ -444,8 +439,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
@@ -467,8 +461,7 @@ public class TestHttpServlet extends TomcatBaseTest {
}
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
@@ -479,9 +472,9 @@ public class TestHttpServlet extends TomcatBaseTest {
pw.write(new char[4 * 1024]);
} else {
ServletOutputStream sos = resp.getOutputStream();
- sos.write(new byte [4 * 1024]);
+ sos.write(new byte[4 * 1024]);
resp.resetBuffer();
- sos.write(new byte [4 * 1024]);
+ sos.write(new byte[4 * 1024]);
}
}
}
@@ -498,8 +491,7 @@ public class TestHttpServlet extends TomcatBaseTest {
}
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
@@ -513,10 +505,10 @@ public class TestHttpServlet extends TomcatBaseTest {
} else {
ServletOutputStream sos = resp.getOutputStream();
resp.addHeader("aaa", "bbb");
- sos.write(new byte [4 * 1024]);
+ sos.write(new byte[4 * 1024]);
resp.resetBuffer();
resp.addHeader("ccc", "ddd");
- sos.write(new byte [4 * 1024]);
+ sos.write(new byte[4 * 1024]);
}
}
}
@@ -533,8 +525,7 @@ public class TestHttpServlet extends TomcatBaseTest {
}
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
AsyncContext ac = req.startAsync(req, resp);
ac.setTimeout(3000);
WriteListener wListener = new NonBlockingWriteListener(ac,
bytesToWrite);
@@ -580,8 +571,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
PrintWriter pw = resp.getWriter();
@@ -595,8 +585,7 @@ public class TestHttpServlet extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doPost(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
doGet(req, resp);
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
index 2eca507ae4..fafdb7cfdf 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite0
extends HttpServletDo
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
index 166f095aa5..cd6770c37d 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite1
extends HttpServletDo
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
index b0f2911fcd..2ebb079d13 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite1023
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
index 2bc3b2cb9b..daa32b920d 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite1024
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
index c348ae72fe..f52399f8b4 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite1025
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
index ae73637a73..54a0d72baa 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite511
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
index cd32dbae0a..ed25a0b51d 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite512
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
index 4e61d9bd00..7d99a11548 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite0ValidWrite513
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(0), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(0), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
index 3a5d2a6580..1ed2d6bf17 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1023ValidWrite0
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
index 77c3b78551..6b02d66fde 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1023ValidWrite1
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
index 7891dac2ff..5b1eec4517 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite1023 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
index fbef824a2a..748b97408e 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite1024 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
index 1feb216b8c..ed289172fc 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite1025 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
index 6e0f1f4b6c..3e9b90d4b2 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite511 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
index 4d2d50f63a..d7f2b502ff 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite512 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
index 7243972a38..cb6a2c6792 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1023ValidWrite513 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1023), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1023), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
index 231f2827d5..766310de66 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1024ValidWrite0
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
index 24432a1375..6d3f099ded 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1024ValidWrite1
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
index af8136a470..05fedd2aee 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite1023 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
index c4c58a6188..8d037bc55d 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite1024 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
index 13961b3ed9..a52bdf235f 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite1025 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
index 0c636711a0..fa77fff50c 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite511 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
index 6a9f811c39..e7f3c3774d 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite512 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
index b175dc9409..d023a82558 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1024ValidWrite513 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1024), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1024), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
index eaa22403ea..c462f08d2c 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1025ValidWrite0
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
index e4ee5fca8e..5765708f8f 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1025ValidWrite1
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
index 2647f7268a..fd86256210 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite1023 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
index 42caab56b5..91e7cc8605 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite1024 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
index 1685b3c384..2e6fe19219 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite1025 extends HttpSer
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
index 01ef3243cb..27660849cf 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite511 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
index 887ab22f2e..2e4f6386b9 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite512 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
index 1d936e9830..8dec732670 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite1025ValidWrite513 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1025), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1025), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
index d4636055d2..eccceee2ce 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite0
extends HttpServletDo
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
index 0388fd04c2..328395dd3f 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite1
extends HttpServletDo
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
index 479ac0d5e2..f62fc08639 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite1023
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
index a2b440192d..b940845aa1 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite1024
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
index 39fa978f95..d5995286ca 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite1025
extends HttpServle
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
index 3390e10d86..bcd2d0ff05 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite511
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
index a6a4414bbf..39bf29a338 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite512
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
index 07761a7fc2..049e2c8ebb 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite1ValidWrite513
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(1), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(1), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
index b99ef3c325..6b9f93deec 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite511ValidWrite0
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
index bb8c3cad3b..e7e290bb5c 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite511ValidWrite1
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
index bbcd2b18eb..e08cf7a862 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite1023 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
index a16f57a842..3f30b4696f 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite1024 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
index 25cf96c974..1c73393f3c 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite1025 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
index 29f6895b48..f35eab3db4 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite511 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
index 3aba507a29..7cc1a773ff 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite512 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
index 0242718d02..abb5d6e844 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite511ValidWrite513 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(511), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(511), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
index ad2cc7c54b..24e6cc0da5 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite512ValidWrite0
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
index 81a1d0137b..3b117e2587 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite512ValidWrite1
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
index 838915d667..1d20a307fd 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite1023 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
index f1d0f0c6fa..f3d8f1208c 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite1024 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
index 3bace1688d..8ef89730a9 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite1025 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
index f2f9985e53..d5002e2e21 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite511 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
index 3e7b63b86d..9ec604e39e 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite512 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
index ab9fc3df94..827445a6f2 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite512ValidWrite513 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(512), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(512), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
index 5b50d1ee8a..d6eca68290 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite513ValidWrite0
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(0), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(0), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
index cc80be1fb3..4cbc4d627b 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
@@ -41,9 +41,8 @@ public class TestHttpServletDoHeadInvalidWrite513ValidWrite1
extends HttpServlet
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(1), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(1), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
index 5871911669..6ddf4e693e 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite1023 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(1023), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(1023), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
index ac4f42a9b6..de674b8f86 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite1024 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(1024), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(1024), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
index 0e876c480e..faafc773d0 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite1025 extends HttpServ
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(1025), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(1025), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
index ad5609a6db..67c4d324be 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite511 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(511), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(511), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
index 4621616328..08c6628e69 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite512 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(512), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(512), f });
}
}
}
diff --git
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
index cbec1a1067..9e59b824c9 100644
---
a/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
+++
b/test/jakarta/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
@@ -41,9 +41,8 @@ public class
TestHttpServletDoHeadInvalidWrite513ValidWrite513 extends HttpServl
for (Boolean w : booleans) {
for (ResetType rt : ResetType.values()) {
for (Boolean f : booleans) {
- parameterSets.add(new Object[] {
- base[0], base[1],
- l, buf, w, Integer.valueOf(513), rt,
Integer.valueOf(513), f });
+ parameterSets.add(new Object[] { base[0],
base[1], l, buf, w, Integer.valueOf(513), rt,
+ Integer.valueOf(513), f });
}
}
}
diff --git a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
index 61b995c115..52b332e6e1 100644
--- a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
+++ b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
@@ -38,9 +38,8 @@ import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.descriptor.web.ErrorPage;
/**
- * These tests evolved out of a discussion in the Jakarta Servlet project
- * regarding the intended behaviour in various error scenarios. Async requests
- * and/or async error pages added additional complexity.
+ * These tests evolved out of a discussion in the Jakarta Servlet project
regarding the intended behaviour in various
+ * error scenarios. Async requests and/or async error pages added additional
complexity.
*/
@RunWith(Parameterized.class)
public class TestHttpServletResponseSendError extends TomcatBaseTest {
@@ -64,20 +63,17 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private enum AsyncErrorPoint {
/*
- * Thread A is the container thread the processes the original request.
- * Thread B is the async thread (may or may not be a container thread)
- * that is started by the async processing.
+ * Thread A is the container thread the processes the original
request. Thread B is the async thread (may or may
+ * not be a container thread) that is started by the async processing.
*/
THREAD_A_BEFORE_START_ASYNC,
THREAD_A_AFTER_START_ASYNC,
THREAD_A_AFTER_START_RUNNABLE,
THREAD_B_BEFORE_COMPLETE
/*
- * If the error is triggered after Thread B completes async processing
- * there is essentially a race condition between thread B making the
- * change and the container checking to see if the error flag has been
- * set. We can't easily control the execution order here so we don't
- * test it.
+ * If the error is triggered after Thread B completes async processing
there is essentially a race condition
+ * between thread B making the change and the container checking to
see if the error flag has been set. We can't
+ * easily control the execution order here so we don't test it.
*/
}
@@ -98,15 +94,15 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
// managed threads are not visible to the
container.
continue;
}
- parameterSets.add(new Object[] { async,
throwException, useDispatch,
- errorPoint, useStart} );
+ parameterSets
+ .add(new Object[] { async,
throwException, useDispatch, errorPoint, useStart });
}
}
}
} else {
// Ignore the async specific parameters
parameterSets.add(new Object[] { async, throwException,
Boolean.FALSE,
- AsyncErrorPoint.THREAD_A_AFTER_START_ASYNC,
Boolean.FALSE} );
+ AsyncErrorPoint.THREAD_A_AFTER_START_ASYNC,
Boolean.FALSE });
}
}
}
@@ -192,8 +188,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
if (throwException) {
throw new SendErrorException();
} else {
@@ -210,9 +205,9 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private static final long serialVersionUID = 1L;
private final boolean throwException;
- private final boolean useDispatch;
+ private final boolean useDispatch;
private final AsyncErrorPoint errorPoint;
- private final boolean useStart;
+ private final boolean useStart;
public TesterAsyncServlet(boolean throwException, boolean useDispatch,
AsyncErrorPoint errorPoint,
boolean useStart) {
@@ -224,8 +219,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
if (errorPoint == AsyncErrorPoint.THREAD_A_BEFORE_START_ASYNC) {
doError(resp);
@@ -270,8 +264,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private final boolean useDispatch;
private final AsyncErrorPoint errorPoint;
- public AsyncRunnable(AsyncContext ac, boolean throwException, boolean
useDispatch,
- AsyncErrorPoint errorPoint) {
+ public AsyncRunnable(AsyncContext ac, boolean throwException, boolean
useDispatch, AsyncErrorPoint errorPoint) {
this.ac = ac;
this.throwException = throwException;
this.useDispatch = useDispatch;
@@ -314,8 +307,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
resp.getWriter().write("DISPATCH");
@@ -335,8 +327,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
resp.getWriter().write("FAIL-599");
@@ -349,8 +340,7 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.setContentType("text/plain");
resp.setCharacterEncoding("UTF-8");
resp.getWriter().write("FAIL-Exception");
diff --git a/test/jakarta/servlet/http/TesterHttpServletPerformance.java
b/test/jakarta/servlet/http/TesterHttpServletPerformance.java
index aeb5cc4ca4..96d82d30aa 100644
--- a/test/jakarta/servlet/http/TesterHttpServletPerformance.java
+++ b/test/jakarta/servlet/http/TesterHttpServletPerformance.java
@@ -33,7 +33,7 @@ import org.apache.catalina.filters.TesterHttpServletResponse;
public class TesterHttpServletPerformance {
@Test
- public void testDoOptions() throws IOException, ServletException{
+ public void testDoOptions() throws IOException, ServletException {
TesterServlet testerServlet = new TesterServlet();
TesterRequest testerRequest = new TesterRequest(false);
TesterHttpServletResponse testerResponse = new
TesterHttpServletResponse();
diff --git a/test/jakarta/servlet/jsp/TestPageContext.java
b/test/jakarta/servlet/jsp/TestPageContext.java
index 116125da20..7987973a5d 100644
--- a/test/jakarta/servlet/jsp/TestPageContext.java
+++ b/test/jakarta/servlet/jsp/TestPageContext.java
@@ -28,8 +28,7 @@ public class TestPageContext extends TomcatBaseTest {
public void testBug49196() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49196.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49196.jsp");
String result = res.toString();
Assert.assertTrue(result.contains("OK"));
diff --git a/test/jakarta/servlet/jsp/TesterPageContext.java
b/test/jakarta/servlet/jsp/TesterPageContext.java
index a3ff277dbe..d824c138d9 100644
--- a/test/jakarta/servlet/jsp/TesterPageContext.java
+++ b/test/jakarta/servlet/jsp/TesterPageContext.java
@@ -40,8 +40,7 @@ public class TesterPageContext extends PageContext {
}
@Override
- public void initialize(Servlet servlet, ServletRequest request,
- ServletResponse response, String errorPageURL,
+ public void initialize(Servlet servlet, ServletRequest request,
ServletResponse response, String errorPageURL,
boolean needsSession, int bufferSize, boolean autoFlush)
throws IOException, IllegalStateException,
IllegalArgumentException {
// NO-OP
@@ -95,33 +94,28 @@ public class TesterPageContext extends PageContext {
}
@Override
- public void forward(String relativeUrlPath) throws ServletException,
- IOException {
+ public void forward(String relativeUrlPath) throws ServletException,
IOException {
// NO-OP
}
@Override
- public void include(String relativeUrlPath) throws ServletException,
- IOException {
+ public void include(String relativeUrlPath) throws ServletException,
IOException {
// NO-OP
}
@Override
- public void include(String relativeUrlPath, boolean flush)
- throws ServletException, IOException {
+ public void include(String relativeUrlPath, boolean flush) throws
ServletException, IOException {
// NO-OP
}
@Override
- public void handlePageException(Exception e) throws ServletException,
- IOException {
+ public void handlePageException(Exception e) throws ServletException,
IOException {
// NO-OP
}
@Override
- public void handlePageException(Throwable t) throws ServletException,
- IOException {
+ public void handlePageException(Throwable t) throws ServletException,
IOException {
// NO-OP
}
diff --git a/test/jakarta/servlet/jsp/TesterPageContextWithAttributes.java
b/test/jakarta/servlet/jsp/TesterPageContextWithAttributes.java
index 7d16b68133..e9a605d7c3 100644
--- a/test/jakarta/servlet/jsp/TesterPageContextWithAttributes.java
+++ b/test/jakarta/servlet/jsp/TesterPageContextWithAttributes.java
@@ -24,10 +24,10 @@ import jakarta.el.ELContext;
import org.apache.jasper.compiler.Localizer;
public class TesterPageContextWithAttributes extends TesterPageContext {
- private final Map<String, Object> applicationAttributes = new HashMap<>();
- private final Map<String, Object> pageAttributes = new HashMap<>();
- private final Map<String, Object> requestAttributes = new HashMap<>();
- private final Map<String, Object> sessionAttributes = new HashMap<>();
+ private final Map<String,Object> applicationAttributes = new HashMap<>();
+ private final Map<String,Object> pageAttributes = new HashMap<>();
+ private final Map<String,Object> requestAttributes = new HashMap<>();
+ private final Map<String,Object> sessionAttributes = new HashMap<>();
public TesterPageContextWithAttributes() {
super();
@@ -49,11 +49,11 @@ public class TesterPageContextWithAttributes extends
TesterPageContext {
}
return switch (scope) {
- case PAGE_SCOPE -> pageAttributes.get(name);
- case REQUEST_SCOPE -> requestAttributes.get(name);
- case SESSION_SCOPE -> sessionAttributes.get(name);
- case APPLICATION_SCOPE -> applicationAttributes.get(name);
- default -> throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
+ case PAGE_SCOPE -> pageAttributes.get(name);
+ case REQUEST_SCOPE -> requestAttributes.get(name);
+ case SESSION_SCOPE -> sessionAttributes.get(name);
+ case APPLICATION_SCOPE -> applicationAttributes.get(name);
+ default -> throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
};
}
@@ -68,20 +68,20 @@ public class TesterPageContextWithAttributes extends
TesterPageContext {
@Override
public void removeAttribute(String name, int scope) {
switch (scope) {
- case PageContext.APPLICATION_SCOPE:
- applicationAttributes.remove(name);
- break;
- case PageContext.PAGE_SCOPE:
- pageAttributes.remove(name);
- break;
- case PageContext.REQUEST_SCOPE:
- requestAttributes.remove(name);
- break;
- case PageContext.SESSION_SCOPE:
- sessionAttributes.remove(name);
- break;
- default:
- throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
+ case PageContext.APPLICATION_SCOPE:
+ applicationAttributes.remove(name);
+ break;
+ case PageContext.PAGE_SCOPE:
+ pageAttributes.remove(name);
+ break;
+ case PageContext.REQUEST_SCOPE:
+ requestAttributes.remove(name);
+ break;
+ case PageContext.SESSION_SCOPE:
+ sessionAttributes.remove(name);
+ break;
+ default:
+ throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
}
}
@@ -96,24 +96,24 @@ public class TesterPageContextWithAttributes extends
TesterPageContext {
removeAttribute(name, scope);
} else {
switch (scope) {
- case PAGE_SCOPE:
- pageAttributes.put(name, value);
- break;
+ case PAGE_SCOPE:
+ pageAttributes.put(name, value);
+ break;
- case REQUEST_SCOPE:
- requestAttributes.put(name, value);
- break;
+ case REQUEST_SCOPE:
+ requestAttributes.put(name, value);
+ break;
- case SESSION_SCOPE:
- sessionAttributes.put(name, value);
- break;
+ case SESSION_SCOPE:
+ sessionAttributes.put(name, value);
+ break;
- case APPLICATION_SCOPE:
- applicationAttributes.put(name, value);
- break;
+ case APPLICATION_SCOPE:
+ applicationAttributes.put(name, value);
+ break;
- default:
- throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
+ default:
+ throw new
IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope"));
}
}
}
diff --git a/test/jakarta/servlet/jsp/el/TestScopedAttributeELResolver.java
b/test/jakarta/servlet/jsp/el/TestScopedAttributeELResolver.java
index 2bb9102cd3..d378a10927 100644
--- a/test/jakarta/servlet/jsp/el/TestScopedAttributeELResolver.java
+++ b/test/jakarta/servlet/jsp/el/TestScopedAttributeELResolver.java
@@ -28,8 +28,7 @@ public class TestScopedAttributeELResolver extends
TomcatBaseTest {
public void testBug49196() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug6nnnn/bug62453.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug6nnnn/bug62453.jsp");
String result = res.toString();
Assert.assertTrue(result, result.contains("<div>foo: OK</div>"));
diff --git
a/test/jakarta/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java
b/test/jakarta/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java
index 3b37ef1ca2..9229807c37 100644
---
a/test/jakarta/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java
+++
b/test/jakarta/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java
@@ -32,8 +32,7 @@ import org.junit.Test;
public class TesterScopedAttributeELResolverPerformance {
/*
- * With the caching of NotFound responses this test takes ~20ms. Without
the
- * caching it takes ~6s.
+ * With the caching of NotFound responses this test takes ~20ms. Without
the caching it takes ~6s.
*/
@Test
public void testGetValuePerformance() throws Exception {
diff --git a/test/jakarta/servlet/resources/TestSchemaValidation.java
b/test/jakarta/servlet/resources/TestSchemaValidation.java
index 146ad5cbcd..1b1b8076f5 100644
--- a/test/jakarta/servlet/resources/TestSchemaValidation.java
+++ b/test/jakarta/servlet/resources/TestSchemaValidation.java
@@ -33,12 +33,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp/WEB-INF/web.xml"));
Assert.assertEquals("6.1", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -47,12 +45,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_2_2() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-2.2/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-2.2/WEB-INF/web.xml"));
Assert.assertEquals("2.2", desc.getVersion());
Assert.assertEquals(XmlIdentifiers.WEB_22_PUBLIC, desc.getPublicId());
Assert.assertEquals(0, handler.getErrors().size());
@@ -62,12 +58,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_2_3() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-2.3/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-2.3/WEB-INF/web.xml"));
Assert.assertEquals("2.3", desc.getVersion());
Assert.assertEquals(XmlIdentifiers.WEB_23_PUBLIC, desc.getPublicId());
Assert.assertEquals(0, handler.getErrors().size());
@@ -77,12 +71,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_2_4() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-2.4/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-2.4/WEB-INF/web.xml"));
Assert.assertEquals("2.4", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -91,12 +83,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_2_5() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-2.5/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-2.5/WEB-INF/web.xml"));
Assert.assertEquals("2.5", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -105,12 +95,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_3_0() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-3.0/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-3.0/WEB-INF/web.xml"));
Assert.assertEquals("3.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -119,12 +107,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_3_1() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-3.1/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-3.1/WEB-INF/web.xml"));
Assert.assertEquals("3.1", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -133,12 +119,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_4_0() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-4.0/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-4.0/WEB-INF/web.xml"));
Assert.assertEquals("4.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -147,12 +131,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_5_0() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-5.0/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-5.0/WEB-INF/web.xml"));
Assert.assertEquals("5.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -162,12 +144,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_6_0() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-6.0/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-6.0/WEB-INF/web.xml"));
Assert.assertEquals("6.0", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
@@ -177,12 +157,10 @@ public class TestSchemaValidation {
@Test
public void testWebapp_6_1() throws Exception {
XmlErrorHandler handler = new XmlErrorHandler();
- Digester digester = DigesterFactory.newDigester(
- true, true, new WebRuleSet(false), true);
+ Digester digester = DigesterFactory.newDigester(true, true, new
WebRuleSet(false), true);
digester.setErrorHandler(handler);
digester.push(new WebXml());
- WebXml desc = (WebXml) digester.parse(
- new File("test/webapp-6.1/WEB-INF/web.xml"));
+ WebXml desc = (WebXml) digester.parse(new
File("test/webapp-6.1/WEB-INF/web.xml"));
Assert.assertEquals("6.1", desc.getVersion());
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
diff --git a/test/jakarta/websocket/TesterContainerProviderPerformance.java
b/test/jakarta/websocket/TesterContainerProviderPerformance.java
index 344008d776..8e19aba190 100644
--- a/test/jakarta/websocket/TesterContainerProviderPerformance.java
+++ b/test/jakarta/websocket/TesterContainerProviderPerformance.java
@@ -32,8 +32,7 @@ public class TesterContainerProviderPerformance {
@Test
public void testGetWebSocketContainer() throws Exception {
for (int i = 1; i < 9; i++) {
- TesterThreadedPerformance test =
- new TesterThreadedPerformance(i, 250000, new
TestInstanceSupplier());
+ TesterThreadedPerformance test = new TesterThreadedPerformance(i,
250000, new TestInstanceSupplier());
long duration = test.doTest();
System.out.println(i + " threads completed in " + duration + "ns");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
