Skip to content

Commit c7ae31d

Browse files
committed
Better names and prepare to test multiple charsets.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1415731 13f79535-47bb-0310-9956-ffa450edef68
1 parent f5e85b1 commit c7ae31d

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,18 @@ private void testCharsetMismatchInfiniteLoop(String csName) throws IOException {
127127

128128
@Test
129129
public void testIO_356() throws Exception {
130-
testIO_356(10, 10); // OK
131-
testIO_356(10, 20); // OK
132-
testIO_356(10, 13); // fails
133-
for (int bs = 1; bs <= 10; bs++) {
134-
for (int ds = 1; ds <= 20; ds++) {
135-
testIO_356(bs, ds);
130+
testIO_356(10, 10, "UTF-8"); // OK
131+
testIO_356(10, 20, "UTF-8"); // OK
132+
testIO_356(10, 13, "UTF-8"); // fails
133+
for (int bufferSize = 1; bufferSize <= 10; bufferSize++) {
134+
for (int dataSize = 1; dataSize <= 20; dataSize++) {
135+
testIO_356(bufferSize, dataSize, "UTF-8");
136136
}
137137
}
138138
}
139139

140-
private void testIO_356(int bufferSize, int dataSize) throws Exception {
141-
CharSequenceInputStream is = new CharSequenceInputStream(ALPHABET, "UTF-8", bufferSize);
140+
private void testIO_356(int bufferSize, int dataSize, String csName) throws Exception {
141+
CharSequenceInputStream is = new CharSequenceInputStream(ALPHABET, csName, bufferSize);
142142

143143
is.mark(dataSize);
144144

@@ -155,7 +155,10 @@ private void testIO_356(int bufferSize, int dataSize) throws Exception {
155155
is.close();
156156

157157
// data buffers should be identical
158-
assertArrayEquals("bufferSize=" + bufferSize + " dataSize=" + dataSize, data1, data2);
158+
assertArrayEquals("bufferSize=" + bufferSize + " dataSize=" + dataSize, data1, data2);
159+
160+
//
161+
159162
}
160163

161164
@Test

0 commit comments

Comments
 (0)