You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2012/11/30 21:52:08 UTC

svn commit: r1415850 [11/15] - in /commons/proper/io/trunk/src: main/java/org/apache/commons/io/ main/java/org/apache/commons/io/comparator/ main/java/org/apache/commons/io/filefilter/ main/java/org/apache/commons/io/input/ main/java/org/apache/commons...

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java Fri Nov 30 20:51:39 2012
@@ -37,9 +37,9 @@ public class IOUtilsWriteTestCase extend
     private static final int FILE_SIZE = 1024 * 4 + 1;
 
 
-    private byte[] inData = generateTestData(FILE_SIZE);
+    private final byte[] inData = generateTestData(FILE_SIZE);
 
-    public IOUtilsWriteTestCase(String testName) {
+    public IOUtilsWriteTestCase(final String testName) {
         super(testName);
     }
 
@@ -61,8 +61,8 @@ public class IOUtilsWriteTestCase extend
 
     //-----------------------------------------------------------------------
     public void testWrite_byteArrayToOutputStream() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write(inData, out);
         out.off();
@@ -73,8 +73,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_byteArrayToOutputStream_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((byte[]) null, out);
         out.off();
@@ -87,14 +87,14 @@ public class IOUtilsWriteTestCase extend
         try {
             IOUtils.write(inData, (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_byteArrayToWriter() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write(inData, writer);
         out.off();
@@ -105,9 +105,9 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_byteArrayToWriter_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write((byte[]) null, writer);
         out.off();
@@ -120,14 +120,14 @@ public class IOUtilsWriteTestCase extend
         try {
             IOUtils.write(inData, (Writer) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_byteArrayToWriter_Encoding() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write(inData, writer, "UTF8");
         out.off();
@@ -139,9 +139,9 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_byteArrayToWriter_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write((byte[]) null, writer, "UTF8");
         out.off();
@@ -154,13 +154,13 @@ public class IOUtilsWriteTestCase extend
         try {
             IOUtils.write(inData, (Writer) null, "UTF8");
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     public void testWrite_byteArrayToWriter_Encoding_nullEncoding() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write(inData, writer, (String) null);
         out.off();
@@ -171,10 +171,10 @@ public class IOUtilsWriteTestCase extend
     }
     //-----------------------------------------------------------------------
     public void testWrite_charSequenceToOutputStream() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write(csq, out);
         out.off();
@@ -185,8 +185,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToOutputStream_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((CharSequence) null, out);
         out.off();
@@ -196,19 +196,19 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToOutputStream_nullStream() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         try {
             IOUtils.write(csq, (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_charSequenceToOutputStream_Encoding() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(csq, out, "UTF16");
         out.off();
@@ -220,8 +220,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToOutputStream_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((CharSequence) null, out);
         out.off();
@@ -231,18 +231,18 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToOutputStream_Encoding_nullStream() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         try {
             IOUtils.write(csq, (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     public void testWrite_charSequenceToOutputStream_nullEncoding() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(csq, out, (String) null);
         out.off();
@@ -254,11 +254,11 @@ public class IOUtilsWriteTestCase extend
 
     //-----------------------------------------------------------------------
     public void testWrite_charSequenceToWriter() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
 
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
 
         IOUtils.write(csq, writer);
         out.off();
@@ -269,9 +269,9 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToWriter_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write((CharSequence) null, writer);
         out.off();
@@ -281,18 +281,18 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charSequenceToWriter_Encoding_nullStream() throws Exception {
-        CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
+        final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
         try {
             IOUtils.write(csq, (Writer) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
     //-----------------------------------------------------------------------
     public void testWrite_stringToOutputStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write(str, out);
         out.off();
@@ -303,8 +303,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToOutputStream_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((String) null, out);
         out.off();
@@ -314,19 +314,19 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToOutputStream_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str, (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_stringToOutputStream_Encoding() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(str, out, "UTF16");
         out.off();
@@ -338,8 +338,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToOutputStream_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((String) null, out);
         out.off();
@@ -349,18 +349,18 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToOutputStream_Encoding_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str, (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     public void testWrite_stringToOutputStream_nullEncoding() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(str, out, (String) null);
         out.off();
@@ -372,11 +372,11 @@ public class IOUtilsWriteTestCase extend
 
     //-----------------------------------------------------------------------
     public void testWrite_stringToWriter() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
 
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
 
         IOUtils.write(str, writer);
         out.off();
@@ -387,9 +387,9 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToWriter_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write((String) null, writer);
         out.off();
@@ -399,19 +399,19 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_stringToWriter_Encoding_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str, (Writer) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_charArrayToOutputStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(str.toCharArray(), out);
         out.off();
@@ -422,8 +422,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToOutputStream_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((char[]) null, out);
         out.off();
@@ -433,19 +433,19 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToOutputStream_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str.toCharArray(), (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWrite_charArrayToOutputStream_Encoding() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(str.toCharArray(), out, "UTF16");
         out.off();
@@ -457,8 +457,8 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToOutputStream_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
         
         IOUtils.write((char[]) null, out);
         out.off();
@@ -468,18 +468,18 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToOutputStream_Encoding_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str.toCharArray(), (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     public void testWrite_charArrayToOutputStream_nullEncoding() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
 
         IOUtils.write(str.toCharArray(), out, (String) null);
         out.off();
@@ -491,11 +491,11 @@ public class IOUtilsWriteTestCase extend
 
     //-----------------------------------------------------------------------
     public void testWrite_charArrayToWriter() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
 
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
 
         IOUtils.write(str.toCharArray(), writer);
         out.off();
@@ -506,9 +506,9 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToWriter_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.write((char[]) null, writer);
         out.off();
@@ -518,35 +518,35 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWrite_charArrayToWriter_Encoding_nullStream() throws Exception {
-        String str = new String(inData, "US-ASCII");
+        final String str = new String(inData, "US-ASCII");
         try {
             IOUtils.write(str.toCharArray(), (Writer) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWriteLines_OutputStream() throws Exception {
-        Object[] data = new Object[] {
+        final Object[] data = new Object[] {
             "hello", new StringBuffer("world"), "", "this is", null, "some text"};
-        List<Object> list = Arrays.asList(data);
+        final List<Object> list = Arrays.asList(data);
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines(list, "*", out);
         
         out.off();
         out.flush();
         
-        String expected = "hello*world**this is**some text*";
-        String actual = baout.toString();
+        final String expected = "hello*world**this is**some text*";
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_OutputStream_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines((List<?>) null, "*", out);
         out.off();
@@ -556,52 +556,52 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWriteLines_OutputStream_nullSeparator() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
             
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines(list, (String) null, out);
         out.off();
         out.flush();
         
-        String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
-        String actual = baout.toString();
+        final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_OutputStream_nullStream() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
         try {
             IOUtils.writeLines(list, "*", (OutputStream) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     //-----------------------------------------------------------------------
     public void testWriteLines_OutputStream_Encoding() throws Exception {
-        Object[] data = new Object[] {
+        final Object[] data = new Object[] {
             "hello\u8364", new StringBuffer("world"), "", "this is", null, "some text"};
-        List<Object> list = Arrays.asList(data);
+        final List<Object> list = Arrays.asList(data);
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines(list, "*", out, "UTF-8");
         
         out.off();
         out.flush();
         
-        String expected = "hello\u8364*world**this is**some text*";
-        String actual = baout.toString("UTF-8");
+        final String expected = "hello\u8364*world**this is**some text*";
+        final String actual = baout.toString("UTF-8");
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_OutputStream_Encoding_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines((List<?>) null, "*", out, "US-ASCII");
         out.off();
@@ -611,72 +611,72 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWriteLines_OutputStream_Encoding_nullSeparator() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
             
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines(list, (String) null, out, "US-ASCII");
         out.off();
         out.flush();
         
-        String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
-        String actual = baout.toString();
+        final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_OutputStream_Encoding_nullStream() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
         try {
             IOUtils.writeLines(list, "*", (OutputStream) null, "US-ASCII");
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
     public void testWriteLines_OutputStream_Encoding_nullEncoding() throws Exception {
-        Object[] data = new Object[] {
+        final Object[] data = new Object[] {
             "hello", new StringBuffer("world"), "", "this is", null, "some text"};
-        List<Object> list = Arrays.asList(data);
+        final List<Object> list = Arrays.asList(data);
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
         
         IOUtils.writeLines(list, "*", out, (String) null);
         
         out.off();
         out.flush();
         
-        String expected = "hello*world**this is**some text*";
-        String actual = baout.toString();
+        final String expected = "hello*world**this is**some text*";
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     //-----------------------------------------------------------------------
     public void testWriteLines_Writer() throws Exception {
-        Object[] data = new Object[] {
+        final Object[] data = new Object[] {
             "hello", new StringBuffer("world"), "", "this is", null, "some text"};
-        List<Object> list = Arrays.asList(data);
+        final List<Object> list = Arrays.asList(data);
         
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.writeLines(list, "*", writer);
         
         out.off();
         writer.flush();
         
-        String expected = "hello*world**this is**some text*";
-        String actual = baout.toString();
+        final String expected = "hello*world**this is**some text*";
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_Writer_nullData() throws Exception {
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.writeLines((List<?>) null, "*", writer);
         out.off();
@@ -686,29 +686,29 @@ public class IOUtilsWriteTestCase extend
     }
 
     public void testWriteLines_Writer_nullSeparator() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
             
-        ByteArrayOutputStream baout = new ByteArrayOutputStream();
-        YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-        Writer writer = new OutputStreamWriter(baout, "US-ASCII");
+        final ByteArrayOutputStream baout = new ByteArrayOutputStream();
+        final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
+        final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
         
         IOUtils.writeLines(list, (String) null, writer);
         out.off();
         writer.flush();
         
-        String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
-        String actual = baout.toString();
+        final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
+        final String actual = baout.toString();
         assertEquals(expected, actual);
     }
 
     public void testWriteLines_Writer_nullStream() throws Exception {
-        Object[] data = new Object[] {"hello", "world"};
-        List<Object> list = Arrays.asList(data);
+        final Object[] data = new Object[] {"hello", "world"};
+        final List<Object> list = Arrays.asList(data);
         try {
             IOUtils.writeLines(list, "*", (Writer) null);
             fail();
-        } catch (NullPointerException ex) {}
+        } catch (final NullPointerException ex) {}
     }
 
 }

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java Fri Nov 30 20:51:39 2012
@@ -40,14 +40,14 @@ import org.junit.Test;
  */
 public class LineIteratorTestCase extends FileBasedTestCase {
 
-    public LineIteratorTestCase(String name) {
+    public LineIteratorTestCase(final String name) {
         super(name);
     }
 
-    private void assertLines(List<String> lines, LineIterator iterator) {
+    private void assertLines(final List<String> lines, final LineIterator iterator) {
         try {
             for (int i = 0; i < lines.size(); i++) {
-                String line = iterator.nextLine();
+                final String line = iterator.nextLine();
                 assertEquals("nextLine() line " + i, lines.get(i), line);
             }
             assertFalse("No more expected", iterator.hasNext());
@@ -59,8 +59,8 @@ public class LineIteratorTestCase extend
     /**
      * Creates a test file with a specified number of lines.
      */
-    private List<String> createLinesFile(File file, int lineCount) throws Exception {
-        List<String> lines = createStringLines(lineCount);
+    private List<String> createLinesFile(final File file, final int lineCount) throws Exception {
+        final List<String> lines = createStringLines(lineCount);
         FileUtils.writeLines(file, lines);
         return lines;
     }
@@ -68,8 +68,8 @@ public class LineIteratorTestCase extend
     /**
      * Creates a test file with a specified number of lines.
      */
-    private List<String> createLinesFile(File file, String encoding, int lineCount) throws Exception {
-        List<String> lines = createStringLines(lineCount);
+    private List<String> createLinesFile(final File file, final String encoding, final int lineCount) throws Exception {
+        final List<String> lines = createStringLines(lineCount);
         FileUtils.writeLines(file, encoding, lines);
         return lines;
     }
@@ -80,8 +80,8 @@ public class LineIteratorTestCase extend
      * @param lineCount
      * @return a new lines list.
      */
-    private List<String> createStringLines(int lineCount) {
-        List<String> lines = new ArrayList<String>();
+    private List<String> createStringLines(final int lineCount) {
+        final List<String> lines = new ArrayList<String>();
         for (int i = 0; i < lineCount; i++) {
             lines.add("LINE " + i);
         }
@@ -92,7 +92,7 @@ public class LineIteratorTestCase extend
     @Override
     @Before
     protected void setUp() throws Exception {
-        File dir = getTestDirectory();
+        final File dir = getTestDirectory();
         if (dir.exists()) {
             FileUtils.deleteDirectory(dir);
         }
@@ -116,7 +116,7 @@ public class LineIteratorTestCase extend
         try {
             new LineIterator((Reader) null);
             fail();
-        } catch (IllegalArgumentException ex) {
+        } catch (final IllegalArgumentException ex) {
             // expected
         }
     }
@@ -158,13 +158,13 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testMissingFile() throws Exception {
-        File testFile = new File(getTestDirectory(), "dummy-missing-file.txt");
+        final File testFile = new File(getTestDirectory(), "dummy-missing-file.txt");
 
         LineIterator iterator = null;
         try {
             iterator = FileUtils.lineIterator(testFile, "UTF-8");
             fail("Expected FileNotFoundException");
-        } catch (FileNotFoundException expected) {
+        } catch (final FileNotFoundException expected) {
             // ignore, expected result
         } finally {
             LineIterator.closeQuietly(iterator);
@@ -176,12 +176,12 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testValidEncoding() throws Exception {
-        String encoding = "UTF-8";
+        final String encoding = "UTF-8";
 
-        File testFile = new File(getTestDirectory(), "LineIterator-validEncoding.txt");
+        final File testFile = new File(getTestDirectory(), "LineIterator-validEncoding.txt");
         createLinesFile(testFile, encoding, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         try {
             int count = 0;
             while (iterator.hasNext()) {
@@ -199,16 +199,16 @@ public class LineIteratorTestCase extend
      */
     @Test    
     public void testInvalidEncoding() throws Exception {
-        String encoding = "XXXXXXXX";
+        final String encoding = "XXXXXXXX";
 
-        File testFile = new File(getTestDirectory(), "LineIterator-invalidEncoding.txt");
+        final File testFile = new File(getTestDirectory(), "LineIterator-invalidEncoding.txt");
         createLinesFile(testFile, "UTF-8", 3);
 
         LineIterator iterator = null;
         try {
             iterator = FileUtils.lineIterator(testFile, encoding);
             fail("Expected UnsupportedCharsetException");
-        } catch (UnsupportedCharsetException expected) {
+        } catch (final UnsupportedCharsetException expected) {
             // ignore, expected result
         } finally {
             LineIterator.closeQuietly(iterator);
@@ -220,10 +220,10 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testNextLineOnlyDefaultEncoding() throws Exception {
-        File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
-        List<String> lines = createLinesFile(testFile, 3);
+        final File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
+        final List<String> lines = createLinesFile(testFile, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile);
+        final LineIterator iterator = FileUtils.lineIterator(testFile);
         assertLines(lines, iterator);
     }
 
@@ -232,12 +232,12 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testNextLineOnlyNullEncoding() throws Exception {
-        String encoding = null;
+        final String encoding = null;
 
-        File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
-        List<String> lines = createLinesFile(testFile, encoding, 3);
+        final File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
+        final List<String> lines = createLinesFile(testFile, encoding, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         assertLines(lines, iterator);
     }
 
@@ -246,12 +246,12 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testNextLineOnlyUtf8Encoding() throws Exception {
-        String encoding = "UTF-8";
+        final String encoding = "UTF-8";
 
-        File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
-        List<String> lines = createLinesFile(testFile, encoding, 3);
+        final File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
+        final List<String> lines = createLinesFile(testFile, encoding, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         assertLines(lines, iterator);
     }
 
@@ -260,15 +260,15 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testNextOnly() throws Exception {
-        String encoding = null;
+        final String encoding = null;
 
-        File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
-        List<String> lines = createLinesFile(testFile, encoding, 3);
+        final File testFile = new File(getTestDirectory(), "LineIterator-nextOnly.txt");
+        final List<String> lines = createLinesFile(testFile, encoding, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         try {
             for (int i = 0; i < lines.size(); i++) {
-                String line = iterator.next();
+                final String line = iterator.next();
                 assertEquals("next() line " + i, lines.get(i), line);
             }
             assertEquals("No more expected", false, iterator.hasNext());
@@ -282,7 +282,7 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testNextWithException() throws Exception {
-        Reader reader = new BufferedReader(new StringReader("")) {
+        final Reader reader = new BufferedReader(new StringReader("")) {
             @Override
             public String readLine() throws IOException {
                 throw new IOException("hasNext");
@@ -291,7 +291,7 @@ public class LineIteratorTestCase extend
         try {
             new LineIterator(reader).hasNext();
             fail("Expected IllegalStateException");
-        } catch (IllegalStateException e) {
+        } catch (final IllegalStateException e) {
             // expected
         }
     }
@@ -301,12 +301,12 @@ public class LineIteratorTestCase extend
      */
     @Test
     public void testCloseEarly() throws Exception {
-        String encoding = "UTF-8";
+        final String encoding = "UTF-8";
 
-        File testFile = new File(getTestDirectory(), "LineIterator-closeEarly.txt");
+        final File testFile = new File(getTestDirectory(), "LineIterator-closeEarly.txt");
         createLinesFile(testFile, encoding, 3);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         try {
             // get
             assertNotNull("Line expected", iterator.next());
@@ -318,13 +318,13 @@ public class LineIteratorTestCase extend
             try {
                 iterator.next();
                 fail();
-            } catch (NoSuchElementException ex) {
+            } catch (final NoSuchElementException ex) {
                 // expected
             }
             try {
                 iterator.nextLine();
                 fail();
-            } catch (NoSuchElementException ex) {
+            } catch (final NoSuchElementException ex) {
                 // expected
             }
 
@@ -333,13 +333,13 @@ public class LineIteratorTestCase extend
             try {
                 iterator.next();
                 fail();
-            } catch (NoSuchElementException ex) {
+            } catch (final NoSuchElementException ex) {
                 // expected
             }
             try {
                 iterator.nextLine();
                 fail();
-            } catch (NoSuchElementException ex) {
+            } catch (final NoSuchElementException ex) {
                 // expected
             }
         } finally {
@@ -350,25 +350,25 @@ public class LineIteratorTestCase extend
     /**
      * Utility method to create and test a file with a specified number of lines.
      */
-    private void doTestFileWithSpecifiedLines(int lineCount) throws Exception {
-        String encoding = "UTF-8";
+    private void doTestFileWithSpecifiedLines(final int lineCount) throws Exception {
+        final String encoding = "UTF-8";
 
-        String fileName = "LineIterator-" + lineCount + "-test.txt";
-        File testFile = new File(getTestDirectory(), fileName);
-        List<String> lines = createLinesFile(testFile, encoding, lineCount);
+        final String fileName = "LineIterator-" + lineCount + "-test.txt";
+        final File testFile = new File(getTestDirectory(), fileName);
+        final List<String> lines = createLinesFile(testFile, encoding, lineCount);
 
-        LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
+        final LineIterator iterator = FileUtils.lineIterator(testFile, encoding);
         try {
             try {
                 iterator.remove();
                 fail("Remove is unsupported");
-            } catch (UnsupportedOperationException ex) {
+            } catch (final UnsupportedOperationException ex) {
                 // expected
             }
 
             int idx = 0;
             while (iterator.hasNext()) {
-                String line = iterator.next();
+                final String line = iterator.next();
                 assertEquals("Comparing line " + idx, lines.get(idx), line);
                 assertTrue("Exceeded expected idx=" + idx + " size=" + lines.size(), idx < lines.size());
                 idx++;
@@ -379,13 +379,13 @@ public class LineIteratorTestCase extend
             try {
                 iterator.next();
                 fail("Expected NoSuchElementException");
-            } catch (NoSuchElementException expected) {
+            } catch (final NoSuchElementException expected) {
                 // ignore, expected result
             }
             try {
                 iterator.nextLine();
                 fail("Expected NoSuchElementException");
-            } catch (NoSuchElementException expected) {
+            } catch (final NoSuchElementException expected) {
                 // ignore, expected result
             }
         } finally {
@@ -396,33 +396,33 @@ public class LineIteratorTestCase extend
     // -----------------------------------------------------------------------
     @Test
     public void testFilteringFileReader() throws Exception {
-        String encoding = "UTF-8";
+        final String encoding = "UTF-8";
 
-        String fileName = "LineIterator-Filter-test.txt";
-        File testFile = new File(getTestDirectory(), fileName);
-        List<String> lines = createLinesFile(testFile, encoding, 9);
+        final String fileName = "LineIterator-Filter-test.txt";
+        final File testFile = new File(getTestDirectory(), fileName);
+        final List<String> lines = createLinesFile(testFile, encoding, 9);
 
-        Reader reader = new FileReader(testFile);
+        final Reader reader = new FileReader(testFile);
         this.testFiltering(lines, reader);
     }
 
     @Test
     public void testFilteringBufferedReader() throws Exception {
-        String encoding = "UTF-8";
+        final String encoding = "UTF-8";
 
-        String fileName = "LineIterator-Filter-test.txt";
-        File testFile = new File(getTestDirectory(), fileName);
-        List<String> lines = createLinesFile(testFile, encoding, 9);
+        final String fileName = "LineIterator-Filter-test.txt";
+        final File testFile = new File(getTestDirectory(), fileName);
+        final List<String> lines = createLinesFile(testFile, encoding, 9);
 
-        Reader reader = new BufferedReader(new FileReader(testFile));
+        final Reader reader = new BufferedReader(new FileReader(testFile));
         this.testFiltering(lines, reader);
     }
 
-    private void testFiltering(List<String> lines, Reader reader) {
-        LineIterator iterator = new LineIterator(reader) {
+    private void testFiltering(final List<String> lines, final Reader reader) {
+        final LineIterator iterator = new LineIterator(reader) {
             @Override
-            protected boolean isValidLine(String line) {
-                char c = line.charAt(line.length() - 1);
+            protected boolean isValidLine(final String line) {
+                final char c = line.charAt(line.length() - 1);
                 return (c - 48) % 3 != 1;
             }
         };
@@ -430,14 +430,14 @@ public class LineIteratorTestCase extend
             try {
                 iterator.remove();
                 fail("Remove is unsupported");
-            } catch (UnsupportedOperationException ex) {
+            } catch (final UnsupportedOperationException ex) {
                 // expected
             }
 
             int idx = 0;
             int actualLines = 0;
             while (iterator.hasNext()) {
-                String line = iterator.next();
+                final String line = iterator.next();
                 actualLines++;
                 assertEquals("Comparing line " + idx, lines.get(idx), line);
                 assertTrue("Exceeded expected idx=" + idx + " size=" + lines.size(), idx < lines.size());
@@ -454,13 +454,13 @@ public class LineIteratorTestCase extend
             try {
                 iterator.next();
                 fail("Expected NoSuchElementException");
-            } catch (NoSuchElementException expected) {
+            } catch (final NoSuchElementException expected) {
                 // ignore, expected result
             }
             try {
                 iterator.nextLine();
                 fail("Expected NoSuchElementException");
-            } catch (NoSuchElementException expected) {
+            } catch (final NoSuchElementException expected) {
                 // ignore, expected result
             }
         } finally {

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java Fri Nov 30 20:51:39 2012
@@ -55,7 +55,7 @@ public class SelectorAdapter extends Sel
     }
 
     @Override
-    public int select(long timeout) throws IOException {
+    public int select(final long timeout) throws IOException {
         return 0;
     }
 

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java Fri Nov 30 20:51:39 2012
@@ -28,9 +28,9 @@ import junit.framework.TestCase;
 public class TaggedIOExceptionTest extends TestCase {
 
     public void testTaggedIOException() {
-        Serializable tag = UUID.randomUUID();
-        IOException exception = new IOException("Test exception");
-        TaggedIOException tagged = new TaggedIOException(exception, tag);
+        final Serializable tag = UUID.randomUUID();
+        final IOException exception = new IOException("Test exception");
+        final TaggedIOException tagged = new TaggedIOException(exception, tag);
         assertTrue(TaggedIOException.isTaggedWith(tagged, tag));
         assertFalse(TaggedIOException.isTaggedWith(tagged, UUID.randomUUID()));
         assertEquals(exception, tagged.getCause());

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java Fri Nov 30 20:51:39 2012
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 public class ThreadMonitorTestCase extends TestCase {
 
 
-    public ThreadMonitorTestCase(String name) {
+    public ThreadMonitorTestCase(final String name) {
         super(name);
     }
 
@@ -33,11 +33,11 @@ public class ThreadMonitorTestCase exten
      */
     public void testTimeout() {
         try {
-            Thread monitor = ThreadMonitor.start(100);
+            final Thread monitor = ThreadMonitor.start(100);
             Thread.sleep(200);
             ThreadMonitor.stop(monitor);
             fail("Expected InterruptedException");
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             // expected result - timout
         }
     }
@@ -47,10 +47,10 @@ public class ThreadMonitorTestCase exten
      */
     public void testCompletedWithoutTimeout() {
         try {
-            Thread monitor = ThreadMonitor.start(200);
+            final Thread monitor = ThreadMonitor.start(200);
             Thread.sleep(100);
             ThreadMonitor.stop(monitor);
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             fail("Timed Out");
         }
     }
@@ -62,21 +62,21 @@ public class ThreadMonitorTestCase exten
 
         // timeout = -1
         try {
-            Thread monitor = ThreadMonitor.start(-1);
+            final Thread monitor = ThreadMonitor.start(-1);
             assertNull("Timeout -1, Monitor should be null", monitor);
             Thread.sleep(100);
             ThreadMonitor.stop(monitor);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Timeout -1, threw " + e);
         }
 
         // timeout = 0
         try {
-            Thread monitor = ThreadMonitor.start(0);
+            final Thread monitor = ThreadMonitor.start(0);
             assertNull("Timeout 0, Monitor should be null", monitor);
             Thread.sleep(100);
             ThreadMonitor.stop(monitor);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             fail("Timeout 0, threw " + e);
         }
     }

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java Fri Nov 30 20:51:39 2012
@@ -51,7 +51,7 @@ public abstract class ComparatorAbstract
      * Construct a new test case with the specified name
      * @param name Name of the test
      */
-    public ComparatorAbstractTestCase(String name) {
+    public ComparatorAbstractTestCase(final String name) {
         super(name);
     }
 
@@ -103,7 +103,7 @@ public abstract class ComparatorAbstract
      * Test the comparator array sort.
      */
     public void testSortArray() {
-        File[] files = new File[3];
+        final File[] files = new File[3];
         files[0] = equalFile1;
         files[1] = moreFile;
         files[2] = lessFile;
@@ -117,7 +117,7 @@ public abstract class ComparatorAbstract
      * Test the comparator array sort.
      */
     public void testSortList() {
-        List<File> files = new ArrayList<File>();
+        final List<File> files = new ArrayList<File>();
         files.add(equalFile1);
         files.add(moreFile);
         files.add(lessFile);

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -31,7 +31,7 @@ public class CompositeFileComparatorTest
      *
      * @param name Name of the test
      */
-    public CompositeFileComparatorTest(String name) {
+    public CompositeFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -42,7 +42,7 @@ public class CompositeFileComparatorTest
         comparator = new CompositeFileComparator(SizeFileComparator.SIZE_COMPARATOR,
                                                  ExtensionFileComparator.EXTENSION_COMPARATOR);
         reverse = new ReverseComparator(comparator);
-        File dir = getTestDirectory();
+        final File dir = getTestDirectory();
         lessFile   = new File(dir, "xyz.txt");
         equalFile1 = new File(dir, "foo.txt");
         equalFile2 = new File(dir, "bar.txt");
@@ -57,10 +57,10 @@ public class CompositeFileComparatorTest
      * Test Constructor with null Iterable
      */
     public void testConstructorIterable() {
-        List<Comparator<File>> list = new ArrayList<Comparator<File>>();
+        final List<Comparator<File>> list = new ArrayList<Comparator<File>>();
         list.add(SizeFileComparator.SIZE_COMPARATOR);
         list.add(ExtensionFileComparator.EXTENSION_COMPARATOR);
-        Comparator<File> c = new CompositeFileComparator(list);
+        final Comparator<File> c = new CompositeFileComparator(list);
 
         assertEquals("equal", 0, c.compare(equalFile1, equalFile2));
         assertTrue("less",  c.compare(lessFile, moreFile) < 0);
@@ -71,7 +71,7 @@ public class CompositeFileComparatorTest
      * Test Constructor with null Iterable
      */
     public void testConstructorIterableNull() {
-        Comparator<File> c = new CompositeFileComparator((Iterable<Comparator<File>>)null);
+        final Comparator<File> c = new CompositeFileComparator((Iterable<Comparator<File>>)null);
         assertEquals("less,more", 0, c.compare(lessFile, moreFile));
         assertEquals("more,less", 0, c.compare(moreFile, lessFile));
         assertEquals("toString", "CompositeFileComparator{}", c.toString());
@@ -81,7 +81,7 @@ public class CompositeFileComparatorTest
      * Test Constructor with null array
      */
     public void testConstructorArrayNull() {
-        Comparator<File> c = new CompositeFileComparator((Comparator<File>[])null);
+        final Comparator<File> c = new CompositeFileComparator((Comparator<File>[])null);
         assertEquals("less,more", 0, c.compare(lessFile, moreFile));
         assertEquals("more,less", 0, c.compare(moreFile, lessFile));
         assertEquals("toString", "CompositeFileComparator{}", c.toString());

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DefaultFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -28,7 +28,7 @@ public class DefaultFileComparatorTest e
      *
      * @param name Name of the test
      */
-    public DefaultFileComparatorTest(String name) {
+    public DefaultFileComparatorTest(final String name) {
         super(name);
     }
 

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/DirectoryFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -28,7 +28,7 @@ public class DirectoryFileComparatorTest
      *
      * @param name Name of the test
      */
-    public DirectoryFileComparatorTest(String name) {
+    public DirectoryFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -38,7 +38,7 @@ public class DirectoryFileComparatorTest
         super.setUp();
         comparator = DirectoryFileComparator.DIRECTORY_COMPARATOR;
         reverse = DirectoryFileComparator.DIRECTORY_REVERSE;
-        File currentDir = new File(".");
+        final File currentDir = new File(".");
         equalFile1 = new File(currentDir, "src");
         equalFile2 = new File(currentDir, "src/site/xdoc");
         lessFile   = new File(currentDir, "src");

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -29,7 +29,7 @@ public class ExtensionFileComparatorTest
      *
      * @param name Name of the test
      */
-    public ExtensionFileComparatorTest(String name) {
+    public ExtensionFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -47,13 +47,13 @@ public class ExtensionFileComparatorTest
 
     /** Test case sensitivity */
     public void testCaseSensitivity() {
-        File file3 = new File("abc.FOO");
-        Comparator<File> sensitive = new ExtensionFileComparator(null); /* test null as well */
+        final File file3 = new File("abc.FOO");
+        final Comparator<File> sensitive = new ExtensionFileComparator(null); /* test null as well */
         assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
         assertTrue("sensitive file1 & less  > 0", sensitive.compare(equalFile1, lessFile) > 0);
 
-        Comparator<File> insensitive = ExtensionFileComparator.EXTENSION_INSENSITIVE_COMPARATOR;
+        final Comparator<File> insensitive = ExtensionFileComparator.EXTENSION_INSENSITIVE_COMPARATOR;
         assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
         assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -28,7 +28,7 @@ public class LastModifiedFileComparatorT
      *
      * @param name Name of the test
      */
-    public LastModifiedFileComparatorTest(String name) {
+    public LastModifiedFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -38,27 +38,27 @@ public class LastModifiedFileComparatorT
         super.setUp();
         comparator = LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
         reverse = LastModifiedFileComparator.LASTMODIFIED_REVERSE;
-        File dir = getTestDirectory();
-        File olderFile = new File(dir, "older.txt");
+        final File dir = getTestDirectory();
+        final File olderFile = new File(dir, "older.txt");
         createFile(olderFile, 0);
 
-        File equalFile = new File(dir, "equal.txt");
+        final File equalFile = new File(dir, "equal.txt");
         createFile(equalFile, 0);
         do {
             try { 
                 Thread.sleep(300);
-            } catch(InterruptedException ie) {
+            } catch(final InterruptedException ie) {
                 // ignore
             }
             equalFile.setLastModified(System.currentTimeMillis());
         } while( olderFile.lastModified() == equalFile.lastModified() );
 
-        File newerFile = new File(dir, "newer.txt");
+        final File newerFile = new File(dir, "newer.txt");
         createFile(newerFile, 0);
         do {
             try { 
                 Thread.sleep(300);
-            } catch(InterruptedException ie) {
+            } catch(final InterruptedException ie) {
                 // ignore
             }
             newerFile.setLastModified(System.currentTimeMillis());

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/NameFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -29,7 +29,7 @@ public class NameFileComparatorTest exte
      *
      * @param name Name of the test
      */
-    public NameFileComparatorTest(String name) {
+    public NameFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -47,13 +47,13 @@ public class NameFileComparatorTest exte
 
     /** Test case sensitivity */
     public void testCaseSensitivity() {
-        File file3 = new File("a/FOO.txt");
-        Comparator<File> sensitive = new NameFileComparator(null); /* test null as well */
+        final File file3 = new File("a/FOO.txt");
+        final Comparator<File> sensitive = new NameFileComparator(null); /* test null as well */
         assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
         assertTrue("sensitive file1 & less  > 0", sensitive.compare(equalFile1, lessFile) > 0);
 
-        Comparator<File> insensitive = NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
+        final Comparator<File> insensitive = NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
         assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
         assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/PathFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -29,7 +29,7 @@ public class PathFileComparatorTest exte
      *
      * @param name Name of the test
      */
-    public PathFileComparatorTest(String name) {
+    public PathFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -47,13 +47,13 @@ public class PathFileComparatorTest exte
 
     /** Test case sensitivity */
     public void testCaseSensitivity() {
-        File file3 = new File("FOO/file.txt");
-        Comparator<File> sensitive = new PathFileComparator(null); /* test null as well */
+        final File file3 = new File("FOO/file.txt");
+        final Comparator<File> sensitive = new PathFileComparator(null); /* test null as well */
         assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
         assertTrue("sensitive file1 & less  > 0", sensitive.compare(equalFile1, lessFile) > 0);
 
-        Comparator<File> insensitive = PathFileComparator.PATH_INSENSITIVE_COMPARATOR;
+        final Comparator<File> insensitive = PathFileComparator.PATH_INSENSITIVE_COMPARATOR;
         assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
         assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
         assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/comparator/SizeFileComparatorTest.java Fri Nov 30 20:51:39 2012
@@ -33,7 +33,7 @@ public class SizeFileComparatorTest exte
      *
      * @param name Name of the test
      */
-    public SizeFileComparatorTest(String name) {
+    public SizeFileComparatorTest(final String name) {
         super(name);
     }
 
@@ -43,11 +43,11 @@ public class SizeFileComparatorTest exte
         super.setUp();
         comparator = SizeFileComparator.SIZE_COMPARATOR;
         reverse = SizeFileComparator.SIZE_REVERSE;
-        File dir = getTestDirectory();
+        final File dir = getTestDirectory();
         smallerDir = new File(dir, "smallerdir");
         largerDir = new File(dir, "largerdir");
         smallerFile = new File(smallerDir, "smaller.txt");
-        File equalFile = new File(dir, "equal.txt");
+        final File equalFile = new File(dir, "equal.txt");
         largerFile = new File(largerDir, "larger.txt");
         smallerDir.mkdir();
         largerDir.mkdir();
@@ -64,7 +64,7 @@ public class SizeFileComparatorTest exte
      * Test a file which doesn't exist.
      */
     public void testNonexistantFile() {
-        File nonexistantFile = new File(new File("."), "nonexistant.txt");
+        final File nonexistantFile = new File(new File("."), "nonexistant.txt");
         assertFalse(nonexistantFile.exists());
         assertTrue("less",  comparator.compare(nonexistantFile, moreFile) < 0);
     }

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java?rev=1415850&r1=1415849&r2=1415850&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java Fri Nov 30 20:51:39 2012
@@ -42,7 +42,7 @@ public class AndFileFilterTestCase exten
   
   @Override
   protected IOFileFilter buildFilterUsingAdd(final List<IOFileFilter> filters) {
-    AndFileFilter filter = new AndFileFilter();
+    final AndFileFilter filter = new AndFileFilter();
     for(int i = 0; i < filters.size(); i++) {
       filter.addFileFilter(filters.get(i));
     }
@@ -115,14 +115,14 @@ public class AndFileFilterTestCase exten
     // test 1 - Test conditional and with all filters returning true
     {
       // test 1 filters
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(trueFilters[1]);
       filters.add(trueFilters[2]);
       filters.add(trueFilters[3]);
       // test 1 true results
-      boolean[] trueResults = new boolean[] {true, true, true};
+      final boolean[] trueResults = new boolean[] {true, true, true};
       // test 1 false results
-      boolean[] falseResults = new boolean[] {false, false, false};
+      final boolean[] falseResults = new boolean[] {false, false, false};
 
       testFilters.add(1, filters);
       testTrueResults.add(1, trueResults);
@@ -134,7 +134,7 @@ public class AndFileFilterTestCase exten
     // test 2 - Test conditional and with first filter returning false
     {
       // test 2 filters
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(falseFilters[1]);
       filters.add(trueFilters[1]);
       filters.add(trueFilters[2]);
@@ -142,9 +142,9 @@ public class AndFileFilterTestCase exten
       filters.add(falseFilters[2]);
       filters.add(falseFilters[3]);
       // test 2 true results
-      boolean[] trueResults = new boolean[] {false, false, false};
+      final boolean[] trueResults = new boolean[] {false, false, false};
       // test 2 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
 
       testFilters.add(2, filters);
       testTrueResults.add(2, trueResults);
@@ -156,7 +156,7 @@ public class AndFileFilterTestCase exten
     // test 3 - Test conditional and with second filter returning false
     {
       // test 3 filters
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(trueFilters[1]);
       filters.add(falseFilters[1]);
       filters.add(trueFilters[2]);
@@ -164,9 +164,9 @@ public class AndFileFilterTestCase exten
       filters.add(falseFilters[2]);
       filters.add(falseFilters[3]);
       // test 3 true results
-      boolean[] trueResults = new boolean[] {true, false, false};
+      final boolean[] trueResults = new boolean[] {true, false, false};
       // test 3 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
 
       testFilters.add(3, filters);
       testTrueResults.add(3, trueResults);
@@ -178,7 +178,7 @@ public class AndFileFilterTestCase exten
     // test 4 - Test conditional and with third filter returning false
     {
       // test 4 filters
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(trueFilters[1]);
       filters.add(trueFilters[2]);
       filters.add(falseFilters[1]);
@@ -186,9 +186,9 @@ public class AndFileFilterTestCase exten
       filters.add(falseFilters[2]);
       filters.add(falseFilters[3]);
       // test 4 true results
-      boolean[] trueResults = new boolean[] {true, true, false};
+      final boolean[] trueResults = new boolean[] {true, true, false};
       // test 4 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(4, filters);
       testTrueResults.add(4, trueResults);
@@ -200,7 +200,7 @@ public class AndFileFilterTestCase exten
     // test 5 - Test conditional and with first and third filters returning false
     {
       // test 5 filters
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(falseFilters[1]);
       filters.add(trueFilters[1]);
       filters.add(falseFilters[2]);
@@ -208,9 +208,9 @@ public class AndFileFilterTestCase exten
       filters.add(trueFilters[2]);
       filters.add(trueFilters[3]);
       // test 5 true results
-      boolean[] trueResults = new boolean[] {false, false, false};
+      final boolean[] trueResults = new boolean[] {false, false, false};
       // test 5 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(5, filters);
       testTrueResults.add(5, trueResults);
@@ -221,7 +221,7 @@ public class AndFileFilterTestCase exten
     
     // test 6 - Test conditional and with second and third filters returning false
     {
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(trueFilters[1]);
       filters.add(falseFilters[1]);
       filters.add(falseFilters[2]);
@@ -229,9 +229,9 @@ public class AndFileFilterTestCase exten
       filters.add(trueFilters[3]);
       filters.add(falseFilters[3]);
       // test 6 true results
-      boolean[] trueResults = new boolean[] {true, false, false};
+      final boolean[] trueResults = new boolean[] {true, false, false};
       // test 6 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(6, filters);
       testTrueResults.add(6, trueResults);
@@ -242,7 +242,7 @@ public class AndFileFilterTestCase exten
     
     // test 7 - Test conditional and with first and second filters returning false
     {
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(falseFilters[1]);
       filters.add(falseFilters[2]);
       filters.add(trueFilters[3]);
@@ -250,9 +250,9 @@ public class AndFileFilterTestCase exten
       filters.add(trueFilters[2]);
       filters.add(trueFilters[3]);
       // test 7 true results
-      boolean[] trueResults = new boolean[] {false, false, false};
+      final boolean[] trueResults = new boolean[] {false, false, false};
       // test 7 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(7, filters);
       testTrueResults.add(7, trueResults);
@@ -263,15 +263,15 @@ public class AndFileFilterTestCase exten
     
     // test 8 - Test conditional and with fourth filters returning false
     {
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(trueFilters[1]);
       filters.add(trueFilters[2]);
       filters.add(trueFilters[3]);
       filters.add(falseFilters[1]);
       // test 8 true results
-      boolean[] trueResults = new boolean[] {true, true, true};
+      final boolean[] trueResults = new boolean[] {true, true, true};
       // test 8 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(8, filters);
       testTrueResults.add(8, trueResults);
@@ -282,14 +282,14 @@ public class AndFileFilterTestCase exten
 
     // test 9 - Test conditional and with all filters returning false
     {
-      List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
+      final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
       filters.add(falseFilters[1]);
       filters.add(falseFilters[2]);
       filters.add(falseFilters[3]);
       // test 9 true results
-      boolean[] trueResults = new boolean[] {false, false, false};
+      final boolean[] trueResults = new boolean[] {false, false, false};
       // test 9 false results
-      boolean[] falseResults = new boolean[] {true, false, false};
+      final boolean[] falseResults = new boolean[] {true, false, false};
     
       testFilters.add(9, filters);
       testTrueResults.add(9, trueResults);