This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit e5021c2a4db8a52c3c81bf8028593fcdaad5456b Author: Gary Gregory <[email protected]> AuthorDate: Fri Aug 7 09:49:46 2020 -0400 Rename test classes from "Yell" to "Throw" prefix. --- .../java/org/apache/commons/io/CopyUtilsTest.java | 28 ++++---- .../org/apache/commons/io/IOUtilsCopyTestCase.java | 64 +++++++++--------- .../org/apache/commons/io/IOUtilsTestCase.java | 14 ++-- .../apache/commons/io/IOUtilsWriteTestCase.java | 78 +++++++++++----------- .../commons/io/input/TeeInputStreamTest.java | 8 +-- .../org/apache/commons/io/input/TeeReaderTest.java | 8 +-- .../commons/io/output/TeeOutputStreamTest.java | 6 +- ...putStream.java => ThrowOnCloseInputStream.java} | 6 +- ...utStream.java => ThrowOnCloseOutputStream.java} | 6 +- ...lOnCloseReader.java => ThrowOnCloseReader.java} | 6 +- ...lOnCloseWriter.java => ThrowOnCloseWriter.java} | 6 +- ....java => ThrowOnFlushAndCloseOutputStream.java} | 4 +- 12 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/test/java/org/apache/commons/io/CopyUtilsTest.java b/src/test/java/org/apache/commons/io/CopyUtilsTest.java index c60d384..9536af0 100644 --- a/src/test/java/org/apache/commons/io/CopyUtilsTest.java +++ b/src/test/java/org/apache/commons/io/CopyUtilsTest.java @@ -29,8 +29,8 @@ import java.util.Arrays; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.io.test.TestUtils; -import org.apache.commons.io.test.YellOnCloseInputStream; -import org.apache.commons.io.test.YellOnFlushAndCloseOutputStream; +import org.apache.commons.io.test.ThrowOnCloseInputStream; +import org.apache.commons.io.test.ThrowOnFlushAndCloseOutputStream; import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") // these are test cases for the deprecated CopyUtils @@ -66,7 +66,7 @@ public class CopyUtilsTest { @Test public void copy_byteArrayToOutputStream() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); CopyUtils.copy(inData, out); @@ -77,7 +77,7 @@ public class CopyUtilsTest { @Test public void copy_byteArrayToWriter() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII"); CopyUtils.copy(inData, writer); @@ -100,10 +100,10 @@ public class CopyUtilsTest { @Test public void testCopy_inputStreamToOutputStream() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final int count = CopyUtils.copy(in, out); @@ -117,10 +117,10 @@ public class CopyUtilsTest { @Test public void copy_inputStreamToWriter() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII"); CopyUtils.copy(in, writer); @@ -144,11 +144,11 @@ public class CopyUtilsTest { @Test public void testCopy_readerToOutputStream() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new java.io.InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); CopyUtils.copy(reader, out); //Note: this method *does* flush. It is equivalent to: @@ -166,11 +166,11 @@ public class CopyUtilsTest { @Test public void copy_readerToWriter() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new java.io.InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII"); final int count = CopyUtils.copy(reader, writer); @@ -185,7 +185,7 @@ public class CopyUtilsTest { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); CopyUtils.copy(str, out); //Note: this method *does* flush. It is equivalent to: @@ -204,7 +204,7 @@ public class CopyUtilsTest { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII"); CopyUtils.copy(str, writer); diff --git a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java index d19deee..2045cbe 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java @@ -35,8 +35,8 @@ import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.io.output.NullWriter; import org.apache.commons.io.test.TestUtils; -import org.apache.commons.io.test.YellOnCloseInputStream; -import org.apache.commons.io.test.YellOnFlushAndCloseOutputStream; +import org.apache.commons.io.test.ThrowOnCloseInputStream; +import org.apache.commons.io.test.ThrowOnFlushAndCloseOutputStream; import org.junit.jupiter.api.Test; /** @@ -63,10 +63,10 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToOutputStream() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final int count = IOUtils.copy(in, out); @@ -129,10 +129,10 @@ public class IOUtilsCopyTestCase { @SuppressWarnings("resource") // 'in' is deliberately not closed private void testCopy_inputStreamToOutputStreamWithBufferSize(final int bufferSize) throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); final long count = IOUtils.copy(in, out, bufferSize); @@ -147,10 +147,10 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToWriter() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.copy(in, writer); // deliberately testing deprecated method @@ -167,10 +167,10 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToWriter_Encoding() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.copy(in, writer, "UTF8"); @@ -187,10 +187,10 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToWriter_Encoding_nullEncoding() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.copy(in, writer, (String) null); @@ -205,7 +205,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToWriter_Encoding_nullIn() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(out, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy(null, writer, "UTF8")); } @@ -220,7 +220,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_inputStreamToWriter_nullIn() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(out, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy((InputStream) null, writer)); } @@ -236,11 +236,11 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToAppendable() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); final long count = IOUtils.copy(reader, (Appendable) writer); @@ -271,7 +271,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToAppendable_nullIn() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Appendable writer = new OutputStreamWriter(out, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader) null, writer)); } @@ -280,7 +280,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToAppendable_nullOut() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy(reader, (Appendable) null)); } @@ -290,11 +290,11 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.copy(reader, out); // deliberately testing deprecated method //Note: this method *does* flush. It is equivalent to: @@ -313,11 +313,11 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_Encoding() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.copy(reader, out, "UTF16"); // note: this method *does* flush. @@ -332,11 +332,11 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_Encoding_nullEncoding() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.copy(reader, out, (String) null); // note: this method *does* flush. @@ -349,7 +349,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_Encoding_nullIn() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); assertThrows(NullPointerException.class, () -> IOUtils.copy(null, out, "UTF16")); } @@ -357,7 +357,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_Encoding_nullOut() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy(reader, null, "UTF16")); } @@ -366,7 +366,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_nullIn() throws Exception { // deliberately testing deprecated method final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader) null, out)); } @@ -374,7 +374,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToOutputStream_nullOut() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy(reader, (OutputStream) null)); // deliberately testing deprecated method } @@ -384,11 +384,11 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToWriter() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); final int count = IOUtils.copy(reader, writer); @@ -422,7 +422,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToWriter_nullIn() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final OutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(out, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy((Reader) null, writer)); } @@ -431,7 +431,7 @@ public class IOUtilsCopyTestCase { @Test public void testCopy_readerToWriter_nullOut() throws Exception { InputStream in = new ByteArrayInputStream(inData); - in = new YellOnCloseInputStream(in); + in = new ThrowOnCloseInputStream(in); final Reader reader = new InputStreamReader(in, "US-ASCII"); assertThrows(NullPointerException.class, () -> IOUtils.copy(reader, (Writer) null)); } diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java index b157e36..d3449e4 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java @@ -65,7 +65,7 @@ import org.apache.commons.io.function.IOConsumer; import org.apache.commons.io.output.AppendableWriter; import org.apache.commons.io.output.StringBuilderWriter; import org.apache.commons.io.test.TestUtils; -import org.apache.commons.io.test.YellOnCloseReader; +import org.apache.commons.io.test.ThrowOnCloseReader; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -143,7 +143,7 @@ public class IOUtilsTestCase { @Test public void testClose() { assertDoesNotThrow(() -> IOUtils.close((Closeable) null)); assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"))); - assertThrows(IOException.class, () -> IOUtils.close(new YellOnCloseReader(new StringReader("s")))); + assertThrows(IOException.class, () -> IOUtils.close(new ThrowOnCloseReader(new StringReader("s")))); } @Test @@ -155,7 +155,7 @@ public class IOUtilsTestCase { assertDoesNotThrow(() -> IOUtils.close((Closeable[]) null)); assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"), nulCloseable)); assertThrows(IOException.class, - () -> IOUtils.close(nulCloseable, new YellOnCloseReader(new StringReader("s")))); + () -> IOUtils.close(nulCloseable, new ThrowOnCloseReader(new StringReader("s")))); } @Test @@ -163,17 +163,17 @@ public class IOUtilsTestCase { Closeable nulCloseable = null; assertDoesNotThrow(() -> IOUtils.close(nulCloseable, null)); // null consumer assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"), null)); // null consumer - assertDoesNotThrow(() -> IOUtils.close(new YellOnCloseReader(new StringReader("s")), null)); // null consumer + assertDoesNotThrow(() -> IOUtils.close(new ThrowOnCloseReader(new StringReader("s")), null)); // null consumer final IOConsumer<IOException> nullConsumer = null; // null consumer doesn't throw assertDoesNotThrow(() -> IOUtils.close(nulCloseable, nullConsumer)); assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"), nullConsumer)); - assertDoesNotThrow(() -> IOUtils.close(new YellOnCloseReader(new StringReader("s")), nullConsumer)); + assertDoesNotThrow(() -> IOUtils.close(new ThrowOnCloseReader(new StringReader("s")), nullConsumer)); final IOConsumer<IOException> silentConsumer = i -> {}; // silent consumer doesn't throw assertDoesNotThrow(() -> IOUtils.close(nulCloseable, silentConsumer)); assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"), silentConsumer)); - assertDoesNotThrow(() -> IOUtils.close(new YellOnCloseReader(new StringReader("s")), silentConsumer)); + assertDoesNotThrow(() -> IOUtils.close(new ThrowOnCloseReader(new StringReader("s")), silentConsumer)); final IOConsumer<IOException> noisyConsumer = i -> { throw i; @@ -181,7 +181,7 @@ public class IOUtilsTestCase { assertDoesNotThrow(() -> IOUtils.close(nulCloseable, noisyConsumer)); // no throw assertDoesNotThrow(() -> IOUtils.close(new StringReader("s"), noisyConsumer)); // no throw assertThrows(IOException.class, - () -> IOUtils.close(new YellOnCloseReader(new StringReader("s")), noisyConsumer)); // closeable throws + () -> IOUtils.close(new ThrowOnCloseReader(new StringReader("s")), noisyConsumer)); // closeable throws } @Test public void testCloseQuietly_AllCloseableIOException() { diff --git a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java index abbed54..c6cf2b1 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.io.test.TestUtils; -import org.apache.commons.io.test.YellOnFlushAndCloseOutputStream; +import org.apache.commons.io.test.ThrowOnFlushAndCloseOutputStream; import org.junit.jupiter.api.Test; /** @@ -51,7 +51,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_byteArrayToOutputStream() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(inData, out); out.off(); @@ -64,7 +64,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_byteArrayToOutputStream_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((byte[]) null, out); out.off(); @@ -87,7 +87,7 @@ public class IOUtilsWriteTestCase { public void testWrite_byteArrayToWriter() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(inData, writer); @@ -102,7 +102,7 @@ public class IOUtilsWriteTestCase { public void testWrite_byteArrayToWriter_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write((byte[]) null, writer); @@ -126,7 +126,7 @@ public class IOUtilsWriteTestCase { public void testWrite_byteArrayToWriter_Encoding() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(inData, writer, "UTF8"); @@ -142,7 +142,7 @@ public class IOUtilsWriteTestCase { public void testWrite_byteArrayToWriter_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(null, writer, "UTF8"); @@ -165,7 +165,7 @@ public class IOUtilsWriteTestCase { public void testWrite_byteArrayToWriter_Encoding_nullEncoding() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(inData, writer, (String) null); @@ -182,7 +182,7 @@ public class IOUtilsWriteTestCase { final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII")); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(csq, out); out.off(); @@ -195,7 +195,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_charSequenceToOutputStream_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((CharSequence) null, out); out.off(); @@ -220,7 +220,7 @@ public class IOUtilsWriteTestCase { final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII")); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(csq, out, "UTF16"); out.off(); @@ -234,7 +234,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_charSequenceToOutputStream_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((CharSequence) null, out); out.off(); @@ -258,7 +258,7 @@ public class IOUtilsWriteTestCase { final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII")); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(csq, out, (String) null); out.off(); @@ -275,7 +275,7 @@ public class IOUtilsWriteTestCase { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(csq, writer); @@ -290,7 +290,7 @@ public class IOUtilsWriteTestCase { public void testWrite_charSequenceToWriter_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write((CharSequence) null, writer); @@ -316,7 +316,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str, out); out.off(); @@ -329,7 +329,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_stringToOutputStream_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((String) null, out); out.off(); @@ -354,7 +354,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str, out, "UTF16"); out.off(); @@ -368,7 +368,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_stringToOutputStream_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((String) null, out); out.off(); @@ -392,7 +392,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str, out, (String) null); out.off(); @@ -409,7 +409,7 @@ public class IOUtilsWriteTestCase { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(str, writer); @@ -424,7 +424,7 @@ public class IOUtilsWriteTestCase { public void testWrite_stringToWriter_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write((String) null, writer); @@ -450,7 +450,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str.toCharArray(), out); out.off(); @@ -463,7 +463,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_charArrayToOutputStream_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((char[]) null, out); out.off(); @@ -488,7 +488,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str.toCharArray(), out, "UTF16"); out.off(); @@ -502,7 +502,7 @@ public class IOUtilsWriteTestCase { @Test public void testWrite_charArrayToOutputStream_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write((char[]) null, out); out.off(); @@ -526,7 +526,7 @@ public class IOUtilsWriteTestCase { final String str = new String(inData, "US-ASCII"); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); IOUtils.write(str.toCharArray(), out, (String) null); out.off(); @@ -543,7 +543,7 @@ public class IOUtilsWriteTestCase { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write(str.toCharArray(), writer); @@ -558,7 +558,7 @@ public class IOUtilsWriteTestCase { public void testWrite_charArrayToWriter_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.write((char[]) null, writer); @@ -586,7 +586,7 @@ public class IOUtilsWriteTestCase { final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(list, "*", out); @@ -601,7 +601,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(null, "*", out); out.off(); @@ -616,7 +616,7 @@ public class IOUtilsWriteTestCase { final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(list, null, out); out.off(); @@ -646,7 +646,7 @@ public class IOUtilsWriteTestCase { final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(list, "*", out, "UTF-8"); @@ -661,7 +661,7 @@ public class IOUtilsWriteTestCase { @Test public void testWriteLines_OutputStream_Encoding_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(null, "*", out, "US-ASCII"); out.off(); @@ -676,7 +676,7 @@ public class IOUtilsWriteTestCase { final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(list, null, out, "US-ASCII"); out.off(); @@ -705,7 +705,7 @@ public class IOUtilsWriteTestCase { final List<Object> list = Arrays.asList(data); final ByteArrayOutputStream baout = new ByteArrayOutputStream(); - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, false, true); IOUtils.writeLines(list, "*", out, (String) null); @@ -726,7 +726,7 @@ public class IOUtilsWriteTestCase { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.writeLines(list, "*", writer); @@ -743,7 +743,7 @@ public class IOUtilsWriteTestCase { public void testWriteLines_Writer_nullData() throws Exception { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.writeLines(null, "*", writer); @@ -760,7 +760,7 @@ public class IOUtilsWriteTestCase { final ByteArrayOutputStream baout = new ByteArrayOutputStream(); @SuppressWarnings("resource") // deliberately not closed - final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true); + final ThrowOnFlushAndCloseOutputStream out = new ThrowOnFlushAndCloseOutputStream(baout, true, true); final Writer writer = new OutputStreamWriter(baout, "US-ASCII"); IOUtils.writeLines(list, null, writer); diff --git a/src/test/java/org/apache/commons/io/input/TeeInputStreamTest.java b/src/test/java/org/apache/commons/io/input/TeeInputStreamTest.java index d81ee76..82e5047 100644 --- a/src/test/java/org/apache/commons/io/input/TeeInputStreamTest.java +++ b/src/test/java/org/apache/commons/io/input/TeeInputStreamTest.java @@ -29,8 +29,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.commons.io.test.YellOnCloseInputStream; -import org.apache.commons.io.test.YellOnCloseOutputStream; +import org.apache.commons.io.test.ThrowOnCloseInputStream; +import org.apache.commons.io.test.ThrowOnCloseOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -122,7 +122,7 @@ public class TeeInputStreamTest { @Test public void testCloseBranchIOException() throws Exception { final ByteArrayInputStream goodIs = mock(ByteArrayInputStream.class); - final OutputStream badOs = new YellOnCloseOutputStream(); + final OutputStream badOs = new ThrowOnCloseOutputStream(); final TeeInputStream nonClosingTis = new TeeInputStream(goodIs, badOs, false); nonClosingTis.close(); @@ -143,7 +143,7 @@ public class TeeInputStreamTest { */ @Test public void testCloseMainIOException() throws IOException { - final InputStream badIs = new YellOnCloseInputStream(); + final InputStream badIs = new ThrowOnCloseInputStream(); final ByteArrayOutputStream goodOs = mock(ByteArrayOutputStream.class); final TeeInputStream nonClosingTis = new TeeInputStream(badIs, goodOs, false); diff --git a/src/test/java/org/apache/commons/io/input/TeeReaderTest.java b/src/test/java/org/apache/commons/io/input/TeeReaderTest.java index c18ac93..c01ac60 100644 --- a/src/test/java/org/apache/commons/io/input/TeeReaderTest.java +++ b/src/test/java/org/apache/commons/io/input/TeeReaderTest.java @@ -31,8 +31,8 @@ import java.io.Writer; import java.nio.CharBuffer; import org.apache.commons.io.output.StringBuilderWriter; -import org.apache.commons.io.test.YellOnCloseReader; -import org.apache.commons.io.test.YellOnCloseWriter; +import org.apache.commons.io.test.ThrowOnCloseReader; +import org.apache.commons.io.test.ThrowOnCloseWriter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -59,7 +59,7 @@ public class TeeReaderTest { @Test public void testCloseBranchIOException() throws Exception { final StringReader goodR = mock(StringReader.class); - final Writer badW = new YellOnCloseWriter(); + final Writer badW = new ThrowOnCloseWriter(); final TeeReader nonClosingTr = new TeeReader(goodR, badW, false); nonClosingTr.close(); @@ -80,7 +80,7 @@ public class TeeReaderTest { */ @Test public void testCloseMainIOException() throws IOException { - final Reader badR = new YellOnCloseReader(); + final Reader badR = new ThrowOnCloseReader(); final StringWriter goodW = mock(StringWriter.class); final TeeReader nonClosingTr = new TeeReader(badR, goodW, false); diff --git a/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java index 49f21ee..8b2dbe1 100644 --- a/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java @@ -25,7 +25,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.commons.io.test.YellOnCloseOutputStream; +import org.apache.commons.io.test.ThrowOnCloseOutputStream; import org.junit.jupiter.api.Test; /**On @@ -39,7 +39,7 @@ public class TeeOutputStreamTest { */ @Test public void testIOExceptionOnCloseBranch() throws IOException { - final OutputStream badOs = new YellOnCloseOutputStream(); + final OutputStream badOs = new ThrowOnCloseOutputStream(); final ByteArrayOutputStream goodOs = mock(ByteArrayOutputStream.class); final TeeOutputStream tos = new TeeOutputStream(goodOs, badOs); try { @@ -56,7 +56,7 @@ public class TeeOutputStreamTest { */ @Test public void testIOExceptionOnClose() throws IOException { - final OutputStream badOs = new YellOnCloseOutputStream(); + final OutputStream badOs = new ThrowOnCloseOutputStream(); final ByteArrayOutputStream goodOs = mock(ByteArrayOutputStream.class); final TeeOutputStream tos = new TeeOutputStream(badOs, goodOs); try { diff --git a/src/test/java/org/apache/commons/io/test/YellOnCloseInputStream.java b/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java similarity index 89% rename from src/test/java/org/apache/commons/io/test/YellOnCloseInputStream.java rename to src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java index 9fe7e47..c8b9a5c 100644 --- a/src/test/java/org/apache/commons/io/test/YellOnCloseInputStream.java +++ b/src/test/java/org/apache/commons/io/test/ThrowOnCloseInputStream.java @@ -25,20 +25,20 @@ import org.apache.commons.io.input.ProxyInputStream; /** * Helper class for checking behavior of IO classes. */ -public class YellOnCloseInputStream extends ProxyInputStream { +public class ThrowOnCloseInputStream extends ProxyInputStream { /** * Default ctor. */ @SuppressWarnings("resource") - public YellOnCloseInputStream() { + public ThrowOnCloseInputStream() { super(new NullInputStream()); } /** * @param proxy InputStream to delegate to. */ - public YellOnCloseInputStream(final InputStream proxy) { + public ThrowOnCloseInputStream(final InputStream proxy) { super(proxy); } diff --git a/src/test/java/org/apache/commons/io/test/YellOnCloseOutputStream.java b/src/test/java/org/apache/commons/io/test/ThrowOnCloseOutputStream.java similarity index 89% rename from src/test/java/org/apache/commons/io/test/YellOnCloseOutputStream.java rename to src/test/java/org/apache/commons/io/test/ThrowOnCloseOutputStream.java index f716af3..949bd4b 100644 --- a/src/test/java/org/apache/commons/io/test/YellOnCloseOutputStream.java +++ b/src/test/java/org/apache/commons/io/test/ThrowOnCloseOutputStream.java @@ -25,19 +25,19 @@ import org.apache.commons.io.output.ProxyOutputStream; /** * Helper class for checking behavior of IO classes. */ -public class YellOnCloseOutputStream extends ProxyOutputStream { +public class ThrowOnCloseOutputStream extends ProxyOutputStream { /** * Default ctor. */ - public YellOnCloseOutputStream() { + public ThrowOnCloseOutputStream() { super(NullOutputStream.NULL_OUTPUT_STREAM); } /** * @param proxy OutputStream to delegate to. */ - public YellOnCloseOutputStream(final OutputStream proxy) { + public ThrowOnCloseOutputStream(final OutputStream proxy) { super(proxy); } diff --git a/src/test/java/org/apache/commons/io/test/YellOnCloseReader.java b/src/test/java/org/apache/commons/io/test/ThrowOnCloseReader.java similarity index 91% rename from src/test/java/org/apache/commons/io/test/YellOnCloseReader.java rename to src/test/java/org/apache/commons/io/test/ThrowOnCloseReader.java index 2a6c73b..427ef81 100644 --- a/src/test/java/org/apache/commons/io/test/YellOnCloseReader.java +++ b/src/test/java/org/apache/commons/io/test/ThrowOnCloseReader.java @@ -25,20 +25,20 @@ import org.apache.commons.io.input.ProxyReader; /** * Helper class for checking behavior of IO classes. */ -public class YellOnCloseReader extends ProxyReader { +public class ThrowOnCloseReader extends ProxyReader { /** * Default ctor. */ @SuppressWarnings("resource") - public YellOnCloseReader() { + public ThrowOnCloseReader() { super(new NullReader()); } /** * @param proxy Reader to delegate to. */ - public YellOnCloseReader(final Reader proxy) { + public ThrowOnCloseReader(final Reader proxy) { super(proxy); } diff --git a/src/test/java/org/apache/commons/io/test/YellOnCloseWriter.java b/src/test/java/org/apache/commons/io/test/ThrowOnCloseWriter.java similarity index 90% rename from src/test/java/org/apache/commons/io/test/YellOnCloseWriter.java rename to src/test/java/org/apache/commons/io/test/ThrowOnCloseWriter.java index 6dda172..6ec07ec 100644 --- a/src/test/java/org/apache/commons/io/test/YellOnCloseWriter.java +++ b/src/test/java/org/apache/commons/io/test/ThrowOnCloseWriter.java @@ -25,19 +25,19 @@ import org.apache.commons.io.output.ProxyWriter; /** * Helper class for checking behavior of IO classes. */ -public class YellOnCloseWriter extends ProxyWriter { +public class ThrowOnCloseWriter extends ProxyWriter { /** * Default ctor. */ - public YellOnCloseWriter() { + public ThrowOnCloseWriter() { super(NullWriter.NULL_WRITER); } /** * @param proxy Writer to delegate to. */ - public YellOnCloseWriter(final Writer proxy) { + public ThrowOnCloseWriter(final Writer proxy) { super(proxy); } diff --git a/src/test/java/org/apache/commons/io/test/YellOnFlushAndCloseOutputStream.java b/src/test/java/org/apache/commons/io/test/ThrowOnFlushAndCloseOutputStream.java similarity index 90% rename from src/test/java/org/apache/commons/io/test/YellOnFlushAndCloseOutputStream.java rename to src/test/java/org/apache/commons/io/test/ThrowOnFlushAndCloseOutputStream.java index 332e4bf..cbf7c49 100644 --- a/src/test/java/org/apache/commons/io/test/YellOnFlushAndCloseOutputStream.java +++ b/src/test/java/org/apache/commons/io/test/ThrowOnFlushAndCloseOutputStream.java @@ -26,7 +26,7 @@ import org.apache.commons.io.output.ProxyOutputStream; /** * Helper class for checking behavior of IO classes. */ -public class YellOnFlushAndCloseOutputStream extends ProxyOutputStream { +public class ThrowOnFlushAndCloseOutputStream extends ProxyOutputStream { private boolean yellOnFlush; private boolean yellOnClose; @@ -36,7 +36,7 @@ public class YellOnFlushAndCloseOutputStream extends ProxyOutputStream { * @param yellOnFlush True if flush() is forbidden * @param yellOnClose True if close() is forbidden */ - public YellOnFlushAndCloseOutputStream(final OutputStream proxy, final boolean yellOnFlush, final boolean yellOnClose) { + public ThrowOnFlushAndCloseOutputStream(final OutputStream proxy, final boolean yellOnFlush, final boolean yellOnClose) { super(proxy); this.yellOnFlush = yellOnFlush; this.yellOnClose = yellOnClose;
