Ensure streams are closed

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1695021 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

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

@@ -367,13 +367,13 @@ public void testMarkResetBeforeReadWithoutBOM() throws Exception {
     public void testNoBoms() throws Exception {
         final byte[] data = new byte[] { 'A', 'B', 'C' };
         try {
-            new BOMInputStream(createUtf8DataStream(data, true), false, (ByteOrderMark[])null);
+            (new BOMInputStream(createUtf8DataStream(data, true), false, (ByteOrderMark[])null)).close();;
             fail("Null BOMs, expected IllegalArgumentException");
         } catch (final IllegalArgumentException e) {
             // expected
         }
         try {
-            new BOMInputStream(createUtf8DataStream(data, true), false, new ByteOrderMark[0]);
+            (new BOMInputStream(createUtf8DataStream(data, true), false, new ByteOrderMark[0])).close();;
             fail("Null BOMs, expected IllegalArgumentException");
         } catch (final IllegalArgumentException e) {
             // expected

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

@@ -68,7 +68,7 @@ protected void _testRawNoBomValid(final String encoding) throws Exception {
     protected void _testRawNoBomInvalid(final String encoding) throws Exception {
         final InputStream is = getXmlStream("no-bom", XML3, encoding, encoding);
         try {
-            new XmlStreamReader(is, false);
+            (new XmlStreamReader(is, false)).close();;
             fail("It should have failed");
         } catch (final IOException ex) {
             assertTrue(ex.getMessage().contains("Invalid encoding,"));
@@ -337,7 +337,7 @@ protected void _testHttpInvalid(final String cT, final String bomEnc, final Stri
         final InputStream is = getXmlStream(bomEnc,
                 prologEnc == null ? XML2 : XML3, streamEnc, prologEnc);
         try {
-            new XmlStreamReader(is, cT, false);
+            (new XmlStreamReader(is, cT, false)).close();;
             fail("It should have failed for HTTP Content-type " + cT + ", BOM "
                     + bomEnc + ", streamEnc " + streamEnc + " and prologEnc "
                     + prologEnc);

src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java

@@ -35,11 +35,13 @@ public void write_four_chunks() throws Exception {
         ChunkedOutputStream chunked = new ChunkedOutputStream(baos, 10);
         chunked.write("0123456789012345678901234567891".getBytes());
         assertEquals(4, numWrites.get());
+        chunked.close();
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void negative_chunksize_not_permitted() {
-        new ChunkedOutputStream(new ByteArrayOutputStream(), 0);
+    public void negative_chunksize_not_permitted() throws Exception{
+        ChunkedOutputStream chunked = new ChunkedOutputStream(new ByteArrayOutputStream(), 0);
+        chunked.close();
     }
 
     @Test
@@ -49,6 +51,7 @@ public void defaultConstructor() throws IOException {
         ChunkedOutputStream chunked = new ChunkedOutputStream(baos);
         chunked.write(new byte[1024 * 4 + 1]);
         assertEquals(2, numWrites.get());
+        chunked.close();
     }
 
     private ByteArrayOutputStream getByteArrayOutputStream(final AtomicInteger numWrites) {

src/test/java/org/apache/commons/io/output/ChunkedWriterTest.java

@@ -34,6 +34,7 @@ public void write_four_chunks() throws Exception {
         chunked.write("0123456789012345678901234567891".toCharArray());
         chunked.flush();
         assertEquals(4, numWrites.get());
+        chunked.close();
     }
 
     @Test
@@ -45,6 +46,7 @@ public void write_two_chunks_default_constructor() throws Exception {
         chunked.write(new char[1024 * 4 + 1]);
         chunked.flush();
         assertEquals(2, numWrites.get());
+        chunked.close();
     }
 
     private OutputStreamWriter getOutputStreamWriter(final AtomicInteger numWrites) {
@@ -59,7 +61,7 @@ public void write(char[] cbuf, int off, int len) throws IOException {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void negative_chunksize_not_permitted() {
-        new ChunkedWriter(new OutputStreamWriter(new ByteArrayOutputStream()), 0);
+    public void negative_chunksize_not_permitted() throws Exception {
+        (new ChunkedWriter(new OutputStreamWriter(new ByteArrayOutputStream()), 0)).close();;
     }
 }

src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java

@@ -27,13 +27,18 @@ public class ClosedOutputStreamTest extends TestCase {
 
     /**
      * Test the <code>write(b)</code> method.
+     * @throws Exception 
      */
-    public void testRead() {
+    public void testRead() throws Exception {
+        ClosedOutputStream cos = null;
         try {
-            new ClosedOutputStream().write('x');
+            cos = new ClosedOutputStream();
+            cos.write('x');
             fail("write(b)");
         } catch (final IOException e) {
             // expected
+        } finally {
+            cos.close();
         }
     }
 

src/test/java/org/apache/commons/io/output/DeferredFileOutputStreamTest.java

@@ -324,15 +324,16 @@ public void testTempFileAboveThresholdPrefixOnly() {
 
     /**
      * Test specifying a temporary file and the threshold is reached.
+     * @throws Exception 
      */
-    public void testTempFileError() {
+    public void testTempFileError() throws Exception {
 
         final String prefix = null;
         final String suffix = ".out";
         final File tempDir  = new File(".");
         try
         {
-            new DeferredFileOutputStream(testBytes.length - 5, prefix, suffix, tempDir);
+            (new DeferredFileOutputStream(testBytes.length - 5, prefix, suffix, tempDir)).close();
             fail("Expected IllegalArgumentException ");
         }
         catch (final IllegalArgumentException e) {