This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 137b40ab29 Code clean-up - formatting. No fumctional change. 137b40ab29 is described below commit 137b40ab29fe9fa2c8afba8d22561728c53db9ca Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Aug 29 18:12:46 2025 +0100 Code clean-up - formatting. No fumctional change. --- test/javax/servlet/http/TestCookie.java | 6 +- test/javax/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 ++++++--------- test/javax/servlet/jsp/TestPageContext.java | 3 +- test/javax/servlet/jsp/TesterPageContext.java | 18 ++---- .../jsp/TesterPageContextWithAttributes.java | 66 +++++++++++----------- .../jsp/el/TestScopedAttributeELResolver.java | 3 +- ...TesterScopedAttributeELResolverPerformance.java | 3 +- .../servlet/resources/TestSchemaValidation.java | 48 ++++++---------- .../TesterContainerProviderPerformance.java | 3 +- 74 files changed, 235 insertions(+), 346 deletions(-) diff --git a/test/javax/servlet/http/TestCookie.java b/test/javax/servlet/http/TestCookie.java index 3068d1e1b7..1617ac8a0e 100644 --- a/test/javax/servlet/http/TestCookie.java +++ b/test/javax/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> @@ -166,7 +166,7 @@ public class TestCookie { @Test public void testClone() { - Cookie a = new Cookie("a","a"); + Cookie a = new Cookie("a", "a"); a.setComment("comment"); a.setDomain("domain"); a.setHttpOnly(true); diff --git a/test/javax/servlet/http/TestHttpServlet.java b/test/javax/servlet/http/TestHttpServlet.java index 855e2ac21e..351cf8412f 100644 --- a/test/javax/servlet/http/TestHttpServlet.java +++ b/test/javax/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/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java index 80fa4fd31b..cef9a1b947 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java index d3579e1778..6cd240d8bf 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java index d98624928b..789c83ba0c 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java index 97d083ce27..a3f0ce7c68 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java index cd30c19eb3..04e1268e4a 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java index f8f2e23395..e1660b17f7 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java index 198d3ccf43..6208d7e980 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java index 2815aba761..ef2412f5a8 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(0), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(0), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java index 8b7b994c6f..f3e1a8872d 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java index 1555e54f68..2cfa823961 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java index c9344376e5..f5fa019bf4 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java index 04b43da5d6..86638f6830 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java index 3cc32baee6..6e0b8d0d43 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java index 68c5e0cad7..4b64df9997 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java index f245fafa64..32327ce8b2 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java index 3b9866914e..0a024845e8 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1023), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1023), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java index 1769fdb6cf..791e6ba309 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java index 2e7d388c71..4b0878f7f4 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java index a9a1e055ad..f500163dd6 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java index 5de4d7c281..63f7515180 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java index 0f568e5111..0d9940828c 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java index feeaab595e..6e55f3bef1 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java index 88c56a94de..e90ec90714 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java index 7904f6061e..60cd830c68 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1024), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1024), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java index 04c8a103b5..7173285325 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java index 828cba671c..7f00853b68 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java index 16a9405137..8921d3a6f0 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java index 8f80f3dcdc..2f8e977097 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java index e8877269a2..19bec502c5 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java index 2a65872634..fd39d83323 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java index 2e13970f32..05974bcd44 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java index 50c97ea082..6e91584dab 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1025), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1025), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java index 85c862124e..3bfbac8ef9 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java index d5735085e9..0e89d2b232 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java index 74adcc567a..f6a5a58f09 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java index 7d15ef77ac..9a24f7700f 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java index 61256bd653..81cd3608f4 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java index 103cc2b5ed..9078443179 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java index 55bebc9f27..caa990f7e4 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java index 17a9bcb563..6fc518316c 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(1), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(1), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java index 1be28b9ffc..477320a4f8 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java index e0a67b1a89..3fb2d4fcdf 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java index a17c181168..6f47e40221 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java index ba51c9c678..6b98f186ad 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java index 971d0bd537..3c3fba5947 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java index c94596196b..a0ae0c77cf 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java index 994e5265ed..c6b53af285 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java index 3fcde7e925..696aa236a3 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(511), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(511), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java index addc5a9a4a..614c5e5ee5 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java index 550ecec444..e6e32840a5 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java index d533c1246c..3a33b38c2e 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java index c50360daa9..ef770e4d93 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java index ada9d70833..7fb6df9034 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java index a245c27056..71db76f408 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java index 579aa3dd3f..f3b3923b31 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java index e9709b1634..52e95d674c 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(512), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(512), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java index 59e21af9c4..f856e46d9e 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(0), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(0), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java index 154577eb34..0220c8edd1 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(1), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(1), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java index 3689aff978..e3195fe50e 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(1023), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(1023), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java index d23a78467b..3399d4d84f 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(1024), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(1024), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java index 9f8b5b0a07..5dbea60119 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(1025), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(1025), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java index 27e344f444..c2d36de5c5 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(511), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(511), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java index 9aaa12a4e3..13f8371b5d 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(512), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(512), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java index cea9ffcc07..8e3d81f20b 100644 --- a/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java +++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java @@ -40,9 +40,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], - buf, w, Integer.valueOf(513), rt, Integer.valueOf(513), f }); + parameterSets.add(new Object[] { base[0], base[1], buf, w, Integer.valueOf(513), rt, + Integer.valueOf(513), f }); } } } diff --git a/test/javax/servlet/http/TestHttpServletResponseSendError.java b/test/javax/servlet/http/TestHttpServletResponseSendError.java index 051a0149f6..94cb116d36 100644 --- a/test/javax/servlet/http/TestHttpServletResponseSendError.java +++ b/test/javax/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/javax/servlet/jsp/TestPageContext.java b/test/javax/servlet/jsp/TestPageContext.java index 433f72d940..5508733d1c 100644 --- a/test/javax/servlet/jsp/TestPageContext.java +++ b/test/javax/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/javax/servlet/jsp/TesterPageContext.java b/test/javax/servlet/jsp/TesterPageContext.java index cdbe9c82b5..20b0b5228b 100644 --- a/test/javax/servlet/jsp/TesterPageContext.java +++ b/test/javax/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/javax/servlet/jsp/TesterPageContextWithAttributes.java b/test/javax/servlet/jsp/TesterPageContextWithAttributes.java index 20a7733367..a64ffdf2d1 100644 --- a/test/javax/servlet/jsp/TesterPageContextWithAttributes.java +++ b/test/javax/servlet/jsp/TesterPageContextWithAttributes.java @@ -24,10 +24,10 @@ import javax.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(); @@ -55,7 +55,7 @@ public class TesterPageContextWithAttributes extends TesterPageContext { return requestAttributes.get(name); case SESSION_SCOPE: return sessionAttributes.get(name); - case APPLICATION_SCOPE : + case APPLICATION_SCOPE: return applicationAttributes.get(name); default: throw new IllegalArgumentException(Localizer.getMessage("jsp.error.page.invalid.scope")); @@ -73,20 +73,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")); } } @@ -101,24 +101,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/javax/servlet/jsp/el/TestScopedAttributeELResolver.java b/test/javax/servlet/jsp/el/TestScopedAttributeELResolver.java index a9106b9fc9..c5327aace3 100644 --- a/test/javax/servlet/jsp/el/TestScopedAttributeELResolver.java +++ b/test/javax/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/javax/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java b/test/javax/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java index adaeabd010..3dd721eb68 100644 --- a/test/javax/servlet/jsp/el/TesterScopedAttributeELResolverPerformance.java +++ b/test/javax/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/javax/servlet/resources/TestSchemaValidation.java b/test/javax/servlet/resources/TestSchemaValidation.java index 4b2e4769ec..ecfc279879 100644 --- a/test/javax/servlet/resources/TestSchemaValidation.java +++ b/test/javax/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("4.0", 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()); diff --git a/test/javax/websocket/TesterContainerProviderPerformance.java b/test/javax/websocket/TesterContainerProviderPerformance.java index 3314e95841..f9c6a907d5 100644 --- a/test/javax/websocket/TesterContainerProviderPerformance.java +++ b/test/javax/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