Skip to content

Commit 15ef9e9

Browse files
committed
Use try-with-resources.
1 parent c382f5d commit 15ef9e9

1 file changed

Lines changed: 22 additions & 23 deletions

File tree

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ public class TaggedReaderTest {
3636

3737
@Test
3838
public void testEmptyReader() throws IOException {
39-
final Reader reader = new TaggedReader(new ClosedReader());
40-
assertFalse(reader.ready());
41-
assertEquals(-1, reader.read());
42-
assertEquals(-1, reader.read(new char[1]));
43-
assertEquals(-1, reader.read(new char[1], 0, 1));
44-
reader.close();
39+
try (final Reader reader = new TaggedReader(ClosedReader.CLOSED_READER)) {
40+
assertFalse(reader.ready());
41+
assertEquals(-1, reader.read());
42+
assertEquals(-1, reader.read(new char[1]));
43+
assertEquals(-1, reader.read(new char[1], 0, 1));
44+
}
4545
}
4646

4747
@Test
4848
public void testNormalReader() throws IOException {
49-
final Reader reader = new TaggedReader(new StringReader("abc"));
50-
assertTrue(reader.ready());
51-
assertEquals('a', reader.read());
52-
final char[] buffer = new char[1];
53-
assertEquals(1, reader.read(buffer));
54-
assertEquals('b', buffer[0]);
55-
assertEquals(1, reader.read(buffer, 0, 1));
56-
assertEquals('c', buffer[0]);
57-
assertEquals(-1, reader.read());
58-
reader.close();
49+
try (final Reader reader = new TaggedReader(new StringReader("abc"))) {
50+
assertTrue(reader.ready());
51+
assertEquals('a', reader.read());
52+
final char[] buffer = new char[1];
53+
assertEquals(1, reader.read(buffer));
54+
assertEquals('b', buffer[0]);
55+
assertEquals(1, reader.read(buffer, 0, 1));
56+
assertEquals('c', buffer[0]);
57+
assertEquals(-1, reader.read());
58+
}
5959
}
6060

6161
@Test
@@ -109,16 +109,15 @@ public void testBrokenReader() {
109109
@Test
110110
public void testOtherException() throws Exception {
111111
final IOException exception = new IOException("test exception");
112-
final Reader closed = new ClosedReader();
113-
final TaggedReader reader = new TaggedReader(closed);
112+
try (final TaggedReader reader = new TaggedReader(ClosedReader.CLOSED_READER)) {
114113

115-
assertFalse(reader.isCauseOf(exception));
116-
assertFalse(reader.isCauseOf(new TaggedIOException(exception, UUID.randomUUID())));
114+
assertFalse(reader.isCauseOf(exception));
115+
assertFalse(reader.isCauseOf(new TaggedIOException(exception, UUID.randomUUID())));
117116

118-
reader.throwIfCauseOf(exception);
117+
reader.throwIfCauseOf(exception);
119118

120-
reader.throwIfCauseOf(new TaggedIOException(exception, UUID.randomUUID()));
121-
reader.close();
119+
reader.throwIfCauseOf(new TaggedIOException(exception, UUID.randomUUID()));
120+
}
122121
}
123122

124123
}

0 commit comments

Comments
 (0)