Narrow allowable Exceptions

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

Author: sebbASF

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

@@ -163,8 +163,8 @@ public void testListFiles() throws Exception {
         try {
             FileUtils.listFiles(getLocalTestDirectory(), (IOFileFilter)null, (IOFileFilter)null);
             fail("Expected error about null parameter");
-        } catch (Exception e) {
-            //fine
+        } catch (NullPointerException e) {
+            // expected
         }
     }
 

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

@@ -151,7 +151,7 @@ public void testMarkAndReset() throws Exception {
         try {
             input.reset();
             fail("Read limit exceeded, expected IOException ");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("No Mark IOException message",
                          "No position has been marked",
                          e.getMessage());
@@ -181,7 +181,7 @@ public void testMarkAndReset() throws Exception {
         try {
             input.reset();
             fail("Read limit exceeded, expected IOException ");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("Read limit IOException message",
                          "Marked position [" + position
                          + "] is no longer valid - passed the read limit ["
@@ -226,7 +226,7 @@ public void testSkip() throws Exception {
         try {
             input.skip(5); //
             fail("Expected IOException for skipping after end of file");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("Skip after EOF IOException message",
                     "Skip after end of file",
                     e.getMessage());

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

@@ -148,7 +148,7 @@ public void testMarkAndReset() throws Exception {
         try {
             reader.reset();
             fail("Read limit exceeded, expected IOException ");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("No Mark IOException message",
                          "No position has been marked",
                          e.getMessage());
@@ -178,7 +178,7 @@ public void testMarkAndReset() throws Exception {
         try {
             reader.reset();
             fail("Read limit exceeded, expected IOException ");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("Read limit IOException message",
                          "Marked position [" + position
                          + "] is no longer valid - passed the read limit ["
@@ -223,7 +223,7 @@ public void testSkip() throws Exception {
         try {
             reader.skip(5); //
             fail("Expected IOException for skipping after end of file");
-        } catch (Exception e) {
+        } catch (IOException e) {
             assertEquals("Skip after EOF IOException message",
                     "Skip after end of file",
                     e.getMessage());