Let JUnit handle the exceptions

Author: sebbASF

src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java

@@ -271,9 +271,10 @@ private static IOFileFilter createNameFilter(final File[] files) {
 
     /**
      * Test Cancel
+     * @throws IOException 
      */
     @Test
-    public void testCancel() {
+    public void testCancel() throws IOException {
         String cancelName = null;
 
         // Cancel on a file
@@ -284,8 +285,6 @@ public void testCancel() {
         } catch (final DirectoryWalker.CancelException cancel) {
             assertEquals("File:  " + cancelName, cancelName, cancel.getFile().getName());
             assertEquals("Depth: " + cancelName, 5, cancel.getDepth());
-        } catch (final IOException ex) {
-            fail("IOException: " + cancelName + " " + ex);
         }
 
         // Cancel on a directory
@@ -296,26 +295,20 @@ public void testCancel() {
         } catch (final DirectoryWalker.CancelException cancel) {
             assertEquals("File:  " + cancelName, cancelName, cancel.getFile().getName());
             assertEquals("Depth: " + cancelName, 3, cancel.getDepth());
-        } catch (final IOException ex) {
-            fail("IOException: " + cancelName + " " + ex);
         }
 
         // Suppress CancelException (use same file name as preceding test)
-        try {
-            final List results = new TestCancelWalker(cancelName, true).find(javaDir);
-            final File lastFile = (File) results.get(results.size() - 1);
-            assertEquals("Suppress:  " + cancelName, cancelName, lastFile.getName());
-        } catch (final IOException ex) {
-            fail("Suppress threw " + ex);
-        }
-
+        final List results = new TestCancelWalker(cancelName, true).find(javaDir);
+        final File lastFile = (File) results.get(results.size() - 1);
+        assertEquals("Suppress:  " + cancelName, cancelName, lastFile.getName());
     }
 
     /**
      * Test Cancel
+     * @throws IOException 
      */
     @Test
-    public void testMultiThreadCancel() {
+    public void testMultiThreadCancel() throws IOException {
         String cancelName = "DirectoryWalker.java";
         TestMultiThreadCancelWalker walker = new TestMultiThreadCancelWalker(cancelName, false);
         // Cancel on a file
@@ -326,8 +319,6 @@ public void testMultiThreadCancel() {
             final File last = (File) walker.results.get(walker.results.size() - 1);
             assertEquals(cancelName, last.getName());
             assertEquals("Depth: " + cancelName, 5, cancel.getDepth());
-        } catch (final IOException ex) {
-            fail("IOException: " + cancelName + " " + ex);
         }
 
         // Cancel on a directory
@@ -339,19 +330,13 @@ public void testMultiThreadCancel() {
         } catch (final DirectoryWalker.CancelException cancel) {
             assertEquals("File:  " + cancelName, cancelName, cancel.getFile().getName());
             assertEquals("Depth: " + cancelName, 3, cancel.getDepth());
-        } catch (final IOException ex) {
-            fail("IOException: " + cancelName + " " + ex);
         }
 
         // Suppress CancelException (use same file name as preceding test)
-        try {
-            walker = new TestMultiThreadCancelWalker(cancelName, true);
-            final List results = walker.find(javaDir);
-            final File lastFile = (File) results.get(results.size() - 1);
-            assertEquals("Suppress:  " + cancelName, cancelName, lastFile.getName());
-        } catch (final IOException ex) {
-            fail("Suppress threw " + ex);
-        }
+        walker = new TestMultiThreadCancelWalker(cancelName, true);
+        final List results = walker.find(javaDir);
+        final File lastFile = (File) results.get(results.size() - 1);
+        assertEquals("Suppress:  " + cancelName, cancelName, lastFile.getName());
 
     }
 

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

@@ -22,8 +22,6 @@
 import java.io.Reader;
 import java.nio.CharBuffer;
 
-import static org.junit.Assert.fail;
-
 /**
  * Test {@link ProxyReader}. 
  *
@@ -34,31 +32,16 @@ public class ProxyReaderTest {
     public void testNullCharArray() throws Exception {
 
         final ProxyReader proxy = new ProxyReaderImpl(new CustomNullReader(0));
-
-        try {
-            proxy.read((char[])null);
-        } catch(final Exception e) {
-            fail("Writing null String threw " + e);
-        }
-
-        try {
-            proxy.read(null, 0, 0);
-        } catch(final Exception e) {
-            fail("Writing null String threw " + e);
-        }
+        proxy.read((char[])null);
+        proxy.read(null, 0, 0);
         proxy.close();
     }
 
     @Test
     public void testNullCharBuffer() throws Exception {
 
         final ProxyReader proxy = new ProxyReaderImpl(new CustomNullReader(0));
-
-        try {
-            proxy.read((CharBuffer)null);
-        } catch(final Exception e) {
-            fail("Writing null String threw " + e);
-        }
+        proxy.read((CharBuffer)null);
         proxy.close();
     }
 

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

@@ -35,36 +35,28 @@
 public class TaggedInputStreamTest  {
 
     @Test
-    public void testEmptyStream() {
-        try {
-            final InputStream stream = new TaggedInputStream(new ClosedInputStream());
-            assertEquals(0, stream.available());
-            assertEquals(-1, stream.read());
-            assertEquals(-1, stream.read(new byte[1]));
-            assertEquals(-1, stream.read(new byte[1], 0, 1));
-            stream.close();
-        } catch (final IOException e) {
-            fail("Unexpected exception thrown");
-        }
+    public void testEmptyStream() throws IOException {
+        final InputStream stream = new TaggedInputStream(new ClosedInputStream());
+        assertEquals(0, stream.available());
+        assertEquals(-1, stream.read());
+        assertEquals(-1, stream.read(new byte[1]));
+        assertEquals(-1, stream.read(new byte[1], 0, 1));
+        stream.close();
     }
 
     @Test
-    public void testNormalStream() {
-        try {
-            final InputStream stream = new TaggedInputStream(
-                    new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' }));
-            assertEquals(3, stream.available());
-            assertEquals('a', stream.read());
-            final byte[] buffer = new byte[1];
-            assertEquals(1, stream.read(buffer));
-            assertEquals('b', buffer[0]);
-            assertEquals(1, stream.read(buffer, 0, 1));
-            assertEquals('c', buffer[0]);
-            assertEquals(-1, stream.read());
-            stream.close();
-        } catch (final IOException e) {
-            fail("Unexpected exception thrown");
-        }
+    public void testNormalStream() throws IOException {
+        final InputStream stream = new TaggedInputStream(
+                new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' }));
+        assertEquals(3, stream.available());
+        assertEquals('a', stream.read());
+        final byte[] buffer = new byte[1];
+        assertEquals(1, stream.read(buffer));
+        assertEquals('b', buffer[0]);
+        assertEquals(1, stream.read(buffer, 0, 1));
+        assertEquals('c', buffer[0]);
+        assertEquals(-1, stream.read());
+        stream.close();
     }
 
     @Test
@@ -126,18 +118,10 @@ public void testOtherException() throws Exception {
         assertFalse(stream.isCauseOf(
                 new TaggedIOException(exception, UUID.randomUUID())));
 
-        try {
-            stream.throwIfCauseOf(exception);
-        } catch (final IOException e) {
-            fail("Unexpected exception thrown");
-        }
+        stream.throwIfCauseOf(exception);
 
-        try {
-            stream.throwIfCauseOf(
+        stream.throwIfCauseOf(
                     new TaggedIOException(exception, UUID.randomUUID()));
-        } catch (final IOException e) {
-            fail("Unexpected exception thrown");
-        }
         stream.close();
     }