(tomcat) 01/02: Refactor into shorter tests

[markt]

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

commit 5af03ad88be6cea4a26f7ef25bd3f0d0dfca0e5f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 31 14:27:40 2025 +0000

    Refactor into shorter tests
---
 ...HttpServletDoHeadInvalidWrite0ValidWrite0.java} | 14 +++---
 ...HttpServletDoHeadInvalidWrite0ValidWrite1.java} | 14 +++---
 ...pServletDoHeadInvalidWrite0ValidWrite1023.java} | 14 +++---
 ...pServletDoHeadInvalidWrite0ValidWrite1024.java} | 14 +++---
 ...pServletDoHeadInvalidWrite0ValidWrite1025.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite0ValidWrite511.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite0ValidWrite512.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite0ValidWrite513.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1023ValidWrite0.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1023ValidWrite1.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1023ValidWrite1023.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1023ValidWrite1024.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1023ValidWrite1025.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1023ValidWrite511.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1023ValidWrite512.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1023ValidWrite513.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1024ValidWrite0.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1024ValidWrite1.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1024ValidWrite1023.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1024ValidWrite1024.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1024ValidWrite1025.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1024ValidWrite511.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1024ValidWrite512.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1024ValidWrite513.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1025ValidWrite0.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1025ValidWrite1.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1025ValidWrite1023.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1025ValidWrite1024.java} | 14 +++---
 ...rvletDoHeadInvalidWrite1025ValidWrite1025.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1025ValidWrite511.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1025ValidWrite512.java} | 14 +++---
 ...ervletDoHeadInvalidWrite1025ValidWrite513.java} | 14 +++---
 ...HttpServletDoHeadInvalidWrite1ValidWrite0.java} | 14 +++---
 ...HttpServletDoHeadInvalidWrite1ValidWrite1.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1ValidWrite1023.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1ValidWrite1024.java} | 14 +++---
 ...pServletDoHeadInvalidWrite1ValidWrite1025.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite1ValidWrite511.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite1ValidWrite512.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite1ValidWrite513.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite511ValidWrite0.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite511ValidWrite1.java} | 14 +++---
 ...ervletDoHeadInvalidWrite511ValidWrite1023.java} | 14 +++---
 ...ervletDoHeadInvalidWrite511ValidWrite1024.java} | 14 +++---
 ...ervletDoHeadInvalidWrite511ValidWrite1025.java} | 14 +++---
 ...ServletDoHeadInvalidWrite511ValidWrite511.java} | 14 +++---
 ...ServletDoHeadInvalidWrite511ValidWrite512.java} | 14 +++---
 ...ServletDoHeadInvalidWrite511ValidWrite513.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite512ValidWrite0.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite512ValidWrite1.java} | 14 +++---
 ...ervletDoHeadInvalidWrite512ValidWrite1023.java} | 14 +++---
 ...ervletDoHeadInvalidWrite512ValidWrite1024.java} | 14 +++---
 ...ervletDoHeadInvalidWrite512ValidWrite1025.java} | 14 +++---
 ...ServletDoHeadInvalidWrite512ValidWrite511.java} | 14 +++---
 ...ServletDoHeadInvalidWrite512ValidWrite512.java} | 14 +++---
 ...ServletDoHeadInvalidWrite512ValidWrite513.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite513ValidWrite0.java} | 14 +++---
 ...tpServletDoHeadInvalidWrite513ValidWrite1.java} | 14 +++---
 ...ervletDoHeadInvalidWrite513ValidWrite1023.java} | 14 +++---
 ...ervletDoHeadInvalidWrite513ValidWrite1024.java} | 14 +++---
 ...ervletDoHeadInvalidWrite513ValidWrite1025.java} | 14 +++---
 ...ServletDoHeadInvalidWrite513ValidWrite511.java} | 14 +++---
 ...ServletDoHeadInvalidWrite513ValidWrite512.java} | 14 +++---
 ...ServletDoHeadInvalidWrite513ValidWrite513.java} | 14 +++---
 .../http/TestHttpServletDoHeadValidWrite1023.java  | 55 ----------------------
 .../http/TestHttpServletDoHeadValidWrite1024.java  | 55 ----------------------
 .../http/TestHttpServletDoHeadValidWrite1025.java  | 55 ----------------------
 .../http/TestHttpServletDoHeadValidWrite513.java   | 55 ----------------------
 68 files changed, 384 insertions(+), 732 deletions(-)

diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
index d0bbfd07a8..80fa4fd31b 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
similarity index 76%
rename from test/javax/servlet/http/TestHttpServletDoHeadValidWrite1.java
rename to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
index f57c08c18b..d3579e1778 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1.java
+++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite1 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite1 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(1), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite511.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
similarity index 75%
rename from test/javax/servlet/http/TestHttpServletDoHeadValidWrite511.java
rename to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
index 8d56c5cc69..d98624928b 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite511.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite511 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite511 extends 
HttpServletDoHeadBaseTes
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(511), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite512.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
similarity index 75%
rename from test/javax/servlet/http/TestHttpServletDoHeadValidWrite512.java
rename to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
index 9f923c146e..97d083ce27 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite512.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite512 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite512 extends 
HttpServletDoHeadBaseTes
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(512), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
index d0bbfd07a8..cd30c19eb3 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
index d0bbfd07a8..f8f2e23395 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
index d0bbfd07a8..198d3ccf43 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
index d0bbfd07a8..2815aba761 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite0ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite0ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
index d0bbfd07a8..8b7b994c6f 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
index d0bbfd07a8..1555e54f68 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
index d0bbfd07a8..c9344376e5 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
index d0bbfd07a8..04b43da5d6 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
index d0bbfd07a8..3cc32baee6 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
index d0bbfd07a8..68c5e0cad7 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
index d0bbfd07a8..f245fafa64 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
index d0bbfd07a8..3b9866914e 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1023ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1023ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
index d0bbfd07a8..1769fdb6cf 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
index d0bbfd07a8..2e7d388c71 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
index d0bbfd07a8..a9a1e055ad 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
index d0bbfd07a8..5de4d7c281 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
index d0bbfd07a8..0f568e5111 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
index d0bbfd07a8..feeaab595e 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
index d0bbfd07a8..88c56a94de 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
index d0bbfd07a8..7904f6061e 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1024ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1024ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
index d0bbfd07a8..04c8a103b5 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
index d0bbfd07a8..828cba671c 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
index d0bbfd07a8..16a9405137 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
index d0bbfd07a8..8f80f3dcdc 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
index d0bbfd07a8..e8877269a2 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
index d0bbfd07a8..2a65872634 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
index d0bbfd07a8..2e13970f32 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
index d0bbfd07a8..50c97ea082 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1025ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1025ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
index d0bbfd07a8..85c862124e 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
index d0bbfd07a8..d5735085e9 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
index d0bbfd07a8..74adcc567a 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
index d0bbfd07a8..7d15ef77ac 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
index d0bbfd07a8..61256bd653 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
index d0bbfd07a8..103cc2b5ed 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
index d0bbfd07a8..55bebc9f27 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
index d0bbfd07a8..17a9bcb563 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite1ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite1ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
index d0bbfd07a8..1be28b9ffc 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
index d0bbfd07a8..e0a67b1a89 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
index d0bbfd07a8..a17c181168 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
index d0bbfd07a8..ba51c9c678 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
index d0bbfd07a8..971d0bd537 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
index d0bbfd07a8..c94596196b 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
index d0bbfd07a8..994e5265ed 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
index d0bbfd07a8..3fcde7e925 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite511ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite511ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
index d0bbfd07a8..addc5a9a4a 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
index d0bbfd07a8..550ecec444 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
index d0bbfd07a8..d533c1246c 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
index d0bbfd07a8..c50360daa9 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
index d0bbfd07a8..ada9d70833 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
index d0bbfd07a8..a245c27056 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
index d0bbfd07a8..579aa3dd3f 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
index d0bbfd07a8..e9709b1634 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite512ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite512ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
index d0bbfd07a8..59e21af9c4 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite0.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite0 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
index d0bbfd07a8..154577eb34 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite1 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
index d0bbfd07a8..3689aff978 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1023.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite1023 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
index d0bbfd07a8..d23a78467b 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1024.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite1024 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
index d0bbfd07a8..9f8b5b0a07 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite1025.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite1025 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
index d0bbfd07a8..27e344f444 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite511.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite511 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
similarity index 76%
copy from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
copy to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
index d0bbfd07a8..9aaa12a4e3 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite512.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite512 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
similarity index 76%
rename from test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
rename to 
test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
index d0bbfd07a8..cea9ffcc07 100644
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite0.java
+++ 
b/test/javax/servlet/http/TestHttpServletDoHeadInvalidWrite513ValidWrite513.java
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized;
  * of an entire test run.
  */
 @RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest {
+public class TestHttpServletDoHeadInvalidWrite513ValidWrite513 extends 
HttpServletDoHeadBaseTest {
 
     @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
     public static Collection<Object[]> parameters() {
@@ -38,13 +38,11 @@ public class TestHttpServletDoHeadValidWrite0 extends 
HttpServletDoHeadBaseTest
         for (Object[] base : baseData) {
             for (Integer buf : BUFFERS) {
                 for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(0), f });
-                            }
+                    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 });
                         }
                     }
                 }
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1023.java 
b/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1023.java
deleted file mode 100644
index a801f926e1..0000000000
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1023.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite1023 extends 
HttpServletDoHeadBaseTest {
-
-    @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
-    public static Collection<Object[]> parameters() {
-        Collection<Object[]> baseData = data();
-
-        List<Object[]> parameterSets = new ArrayList<>();
-        for (Object[] base : baseData) {
-            for (Integer buf : BUFFERS) {
-                for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(1023), f });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return parameterSets;
-    }
-}
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1024.java 
b/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1024.java
deleted file mode 100644
index fea621d1f8..0000000000
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1024.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite1024 extends 
HttpServletDoHeadBaseTest {
-
-    @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
-    public static Collection<Object[]> parameters() {
-        Collection<Object[]> baseData = data();
-
-        List<Object[]> parameterSets = new ArrayList<>();
-        for (Object[] base : baseData) {
-            for (Integer buf : BUFFERS) {
-                for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(1024), f });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return parameterSets;
-    }
-}
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1025.java 
b/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1025.java
deleted file mode 100644
index 8cd295e729..0000000000
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite1025.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite1025 extends 
HttpServletDoHeadBaseTest {
-
-    @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
-    public static Collection<Object[]> parameters() {
-        Collection<Object[]> baseData = data();
-
-        List<Object[]> parameterSets = new ArrayList<>();
-        for (Object[] base : baseData) {
-            for (Integer buf : BUFFERS) {
-                for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(1025), f });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return parameterSets;
-    }
-}
diff --git a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite513.java 
b/test/javax/servlet/http/TestHttpServletDoHeadValidWrite513.java
deleted file mode 100644
index 274ca0fe84..0000000000
--- a/test/javax/servlet/http/TestHttpServletDoHeadValidWrite513.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package javax.servlet.http;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestHttpServletDoHeadValidWrite513 extends 
HttpServletDoHeadBaseTest {
-
-    @Parameterized.Parameters(name = "{index}: {0} {1} {2} {3} {4} {5} {6} 
{7}")
-    public static Collection<Object[]> parameters() {
-        Collection<Object[]> baseData = data();
-
-        List<Object[]> parameterSets = new ArrayList<>();
-        for (Object[] base : baseData) {
-            for (Integer buf : BUFFERS) {
-                for (Boolean w : booleans) {
-                    for (Integer c1 : COUNTS) {
-                        for (ResetType rt : ResetType.values()) {
-                            for (Boolean f : booleans) {
-                                        parameterSets.add(new Object[] {
-                                                base[0], base[1],
-                                                buf, w, c1, rt, 
Integer.valueOf(513), f });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return parameterSets;
-    }
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org