commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1302382 - in /commons/proper/io/trunk/src: site/xdoc/ test/java/org/apache/commons/io/ test/resources/org/apache/commons/io/
Date Mon, 19 Mar 2012 11:50:36 GMT
Author: sebb
Date: Mon Mar 19 11:50:35 2012
New Revision: 1302382

URL: http://svn.apache.org/viewvc?rev=1302382&view=rev
Log:
eol native

Modified:
    commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml   (contents, props changed)
    commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml   (contents, props changed)
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java   (contents, props changed)
    commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java   (contents, props changed)
    commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml   (contents, props changed)
    commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml   (contents, props changed)

Modified: commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml?rev=1302382&r1=1302381&r2=1302382&view=diff
==============================================================================
--- commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml (original)
+++ commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml Mon Mar 19 11:50:35 2012
@@ -1,82 +1,82 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<document>
- <properties>
-  <title>Upgrade from 2.0.1 to 2.1</title>
-  <author email="dev@commons.apache.org">Commons Documentation Team</author>
- </properties>
-<body>
-
-<section name="Upgrade">
-<p>
-These are the release notes and advice for upgrading Commons-IO from
-version 2.0.1 to version 2.1
-<source>
-Commons IO is a package of Java utility classes for java.io's hierarchy.  
-Classes in this package are considered to be so standard and of such high 
-reuse as to justify existence in java.io.
-
-Commons IO contains utility classes, stream implementations, file filters, 
-file comparators and endian transformation classes.
-
-Compatibility with 2.0.1 and 1.4
---------------------------------
-
-Binary compatible - Yes
-
-Source compatible - Yes
-
-Semantic compatible - Yes
-  Check the bug fixes section for semantic bug fixes
-
-Commons IO 2.1 requires a minimum of JDK 1.5
-  (Commons IO 1.4 had a minimum of JDK 1.3) 
-
-
-New features since 2.0.1
-------------------------
-
-o Use standard Maven directory layout  Issue: IO-285. Thanks to ggregory. 
-o Add IOUtils API toString for URL and URI to get contents  Issue: IO-284. Thanks to ggregory. 
-o Add API FileUtils.copyFile(File input, OutputStream output)  Issue: IO-282. Thanks to ggregory. 
-o FileAlterationObserver has no getter for FileFilter  Issue: IO-262. 
-o Add FileUtils.getFile API with varargs parameter  Issue: IO-261. 
-o Add new APPEND parameter for writing string into files  Issue: IO-182. 
-o Add new read method "toByteArray" to handle InputStream with known size.  Issue: IO-251. Thanks to Marco Albini. 
-
-Fixed Bugs since 2.0.1
-----------------------
-
-o Dubious use of mkdirs() return code  Issue: IO-280. Thanks to sebb. 
-o ReaderInputStream enters infinite loop when it encounters an unmappable character  Issue: IO-277. 
-o FileUtils.moveFile() JavaDoc should specify FileExistsException thrown  Issue: IO-264. 
-o ClassLoaderObjectInputStream does not handle Proxy classes  Issue: IO-260. 
-o Tailer returning partial lines when reaching EOF before EOL  Issue: IO-274. Thanks to Frank Grimes. 
-o FileUtils.copyFile() throws IOException when copying large files to a shared directory (on Windows)  Issue: IO-266. Thanks to Igor Smereka. 
-o FileSystemUtils.freeSpaceKb throws exception for Windows volumes with no visible files.
-        Improve coverage by also looking for hidden files.  Issue: IO-263. Thanks to Gil Adam. 
-
-Changes since 2.0.1
--------------------
-o FileAlterationMonitor.stop(boolean allowIntervalToFinish)  Issue: IO-259. 
-</source>
-</p>
-</section>
-
-</body>
-</document>
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+  <title>Upgrade from 2.0.1 to 2.1</title>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Commons-IO from
+version 2.0.1 to version 2.1
+<source>
+Commons IO is a package of Java utility classes for java.io's hierarchy.  
+Classes in this package are considered to be so standard and of such high 
+reuse as to justify existence in java.io.
+
+Commons IO contains utility classes, stream implementations, file filters, 
+file comparators and endian transformation classes.
+
+Compatibility with 2.0.1 and 1.4
+--------------------------------
+
+Binary compatible - Yes
+
+Source compatible - Yes
+
+Semantic compatible - Yes
+  Check the bug fixes section for semantic bug fixes
+
+Commons IO 2.1 requires a minimum of JDK 1.5
+  (Commons IO 1.4 had a minimum of JDK 1.3) 
+
+
+New features since 2.0.1
+------------------------
+
+o Use standard Maven directory layout  Issue: IO-285. Thanks to ggregory. 
+o Add IOUtils API toString for URL and URI to get contents  Issue: IO-284. Thanks to ggregory. 
+o Add API FileUtils.copyFile(File input, OutputStream output)  Issue: IO-282. Thanks to ggregory. 
+o FileAlterationObserver has no getter for FileFilter  Issue: IO-262. 
+o Add FileUtils.getFile API with varargs parameter  Issue: IO-261. 
+o Add new APPEND parameter for writing string into files  Issue: IO-182. 
+o Add new read method "toByteArray" to handle InputStream with known size.  Issue: IO-251. Thanks to Marco Albini. 
+
+Fixed Bugs since 2.0.1
+----------------------
+
+o Dubious use of mkdirs() return code  Issue: IO-280. Thanks to sebb. 
+o ReaderInputStream enters infinite loop when it encounters an unmappable character  Issue: IO-277. 
+o FileUtils.moveFile() JavaDoc should specify FileExistsException thrown  Issue: IO-264. 
+o ClassLoaderObjectInputStream does not handle Proxy classes  Issue: IO-260. 
+o Tailer returning partial lines when reaching EOF before EOL  Issue: IO-274. Thanks to Frank Grimes. 
+o FileUtils.copyFile() throws IOException when copying large files to a shared directory (on Windows)  Issue: IO-266. Thanks to Igor Smereka. 
+o FileSystemUtils.freeSpaceKb throws exception for Windows volumes with no visible files.
+        Improve coverage by also looking for hidden files.  Issue: IO-263. Thanks to Gil Adam. 
+
+Changes since 2.0.1
+-------------------
+o FileAlterationMonitor.stop(boolean allowIntervalToFinish)  Issue: IO-259. 
+</source>
+</p>
+</section>
+
+</body>
+</document>

Propchange: commons/proper/io/trunk/src/site/xdoc/upgradeto2_1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml?rev=1302382&r1=1302381&r2=1302382&view=diff
==============================================================================
--- commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml (original)
+++ commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml Mon Mar 19 11:50:35 2012
@@ -1,82 +1,82 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<document>
- <properties>
-  <title>Upgrade from 2.1 to 2.2</title>
-  <author email="dev@commons.apache.org">Commons Documentation Team</author>
- </properties>
-<body>
-
-<section name="Upgrade">
-<p>
-These are the release notes and advice for upgrading Commons-IO from
-version 2.1 to version 2.2
-<source>
-Commons IO is a package of Java utility classes like java.io.  
-Classes in this package are considered to be so standard and of such high 
-reuse as to justify existence in java.io.
-
-Commons IO contains utility classes, stream implementations, file filters, 
-file comparators, endian transformation classes, and much more.
-
-==============================================================================
-Commons IO Package Version 2.2
-==============================================================================
-
-Changes in this version include:
-
-New features:
-o IO-305:  New copyLarge() method in IOUtils that takes additional offset, length arguments Thanks to Manoj Mokashi. 
-o IO-287:  Use terabyte (TB) , petabyte (PB) and exabyte (EB) in FileUtils.byteCountToDisplaySize(long size) Thanks to Ron Kuris, Gary Gregory. 
-o IO-173:  FileUtils.listFiles() doesn't return directories Thanks to Marcos Vinícius da Silva. 
-o IO-297:  CharSequenceInputStream to efficiently stream content of a CharSequence Thanks to Oleg Kalnichevski. 
-o IO-304:  The second constructor of Tailer class does not pass 'delay' to the third one Thanks to liangly. 
-o IO-303:  TeeOutputStream does not call branch.close() when main.close() throws an exception Thanks to fabian.barney. 
-o IO-302:  ArrayIndexOutOfBoundsException in BOMInputStream when reading a file without BOM multiple times Thanks to jsteuerwald, detinho. 
-o IO-301:  Add IOUtils.closeQuietly(Selector) necessary Thanks to kaykay.unique. 
-o IO-292:  IOUtils.closeQuietly() should take a ServerSocket as a parameter Thanks to sebb. 
-o IO-290:  Add read/readFully methods to IOUtils Thanks to sebb. 
-o IO-288:  Supply a ReversedLinesFileReader Thanks to Georg Henzler. 
-o IO-291:  Add new function FileUtils.directoryContains. Thanks to ggregory. 
-o IO-275:  FileUtils.contentEquals and IOUtils.contentEquals - Add option to ignore "line endings"
-        Added contentEqualsIgnoreEOL methods to both classes Thanks to CJ Aspromgos. 
-
-Fixed Bugs:
-o IO-300:  FileUtils.moveDirectoryToDirectory removes source directory if destination is a subdirectory 
-o IO-307:  ReaderInputStream#read(byte[] b, int off, int len) should check for valid parameters 
-o IO-306:  ReaderInputStream#read(byte[] b, int off, int len) should always return 0 for length == 0 
-o IO-276:  "FileUtils#deleteDirectoryOnExit(File)" does not work Thanks to nkami. 
-o IO-273:  BoundedInputStream.read() treats max differently from BoundedInputStream.read(byte[]...) Thanks to sebb. 
-o IO-298:  Various methods of class 'org.apache.commons.io.FileUtils' incorrectly suppress 'java.io.IOException' Thanks to Christian Schulte. 
-
-Changes:
-o IO-296:  ReaderInputStream optimization: more efficient reading of small chunks of data Thanks to Oleg Kalnichevski. 
-
-Compatibility with 2.1 and 1.4:
-Binary compatible: Yes
-Source compatible: Yes
-Semantic compatible: Yes. Check the bug fixes section for semantic bug fixes
-
-Commons IO 2.2 requires a minimum of JDK 1.5. 
-Commons IO 1.4 requires a minimum of JDK 1.3. 
-</source>
-</p>
-</section>
-
-</body>
-</document>
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<document>
+ <properties>
+  <title>Upgrade from 2.1 to 2.2</title>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Upgrade">
+<p>
+These are the release notes and advice for upgrading Commons-IO from
+version 2.1 to version 2.2
+<source>
+Commons IO is a package of Java utility classes like java.io.  
+Classes in this package are considered to be so standard and of such high 
+reuse as to justify existence in java.io.
+
+Commons IO contains utility classes, stream implementations, file filters, 
+file comparators, endian transformation classes, and much more.
+
+==============================================================================
+Commons IO Package Version 2.2
+==============================================================================
+
+Changes in this version include:
+
+New features:
+o IO-305:  New copyLarge() method in IOUtils that takes additional offset, length arguments Thanks to Manoj Mokashi. 
+o IO-287:  Use terabyte (TB) , petabyte (PB) and exabyte (EB) in FileUtils.byteCountToDisplaySize(long size) Thanks to Ron Kuris, Gary Gregory. 
+o IO-173:  FileUtils.listFiles() doesn't return directories Thanks to Marcos Vinícius da Silva. 
+o IO-297:  CharSequenceInputStream to efficiently stream content of a CharSequence Thanks to Oleg Kalnichevski. 
+o IO-304:  The second constructor of Tailer class does not pass 'delay' to the third one Thanks to liangly. 
+o IO-303:  TeeOutputStream does not call branch.close() when main.close() throws an exception Thanks to fabian.barney. 
+o IO-302:  ArrayIndexOutOfBoundsException in BOMInputStream when reading a file without BOM multiple times Thanks to jsteuerwald, detinho. 
+o IO-301:  Add IOUtils.closeQuietly(Selector) necessary Thanks to kaykay.unique. 
+o IO-292:  IOUtils.closeQuietly() should take a ServerSocket as a parameter Thanks to sebb. 
+o IO-290:  Add read/readFully methods to IOUtils Thanks to sebb. 
+o IO-288:  Supply a ReversedLinesFileReader Thanks to Georg Henzler. 
+o IO-291:  Add new function FileUtils.directoryContains. Thanks to ggregory. 
+o IO-275:  FileUtils.contentEquals and IOUtils.contentEquals - Add option to ignore "line endings"
+        Added contentEqualsIgnoreEOL methods to both classes Thanks to CJ Aspromgos. 
+
+Fixed Bugs:
+o IO-300:  FileUtils.moveDirectoryToDirectory removes source directory if destination is a subdirectory 
+o IO-307:  ReaderInputStream#read(byte[] b, int off, int len) should check for valid parameters 
+o IO-306:  ReaderInputStream#read(byte[] b, int off, int len) should always return 0 for length == 0 
+o IO-276:  "FileUtils#deleteDirectoryOnExit(File)" does not work Thanks to nkami. 
+o IO-273:  BoundedInputStream.read() treats max differently from BoundedInputStream.read(byte[]...) Thanks to sebb. 
+o IO-298:  Various methods of class 'org.apache.commons.io.FileUtils' incorrectly suppress 'java.io.IOException' Thanks to Christian Schulte. 
+
+Changes:
+o IO-296:  ReaderInputStream optimization: more efficient reading of small chunks of data Thanks to Oleg Kalnichevski. 
+
+Compatibility with 2.1 and 1.4:
+Binary compatible: Yes
+Source compatible: Yes
+Semantic compatible: Yes. Check the bug fixes section for semantic bug fixes
+
+Commons IO 2.2 requires a minimum of JDK 1.5. 
+Commons IO 1.4 requires a minimum of JDK 1.3. 
+</source>
+</p>
+</section>
+
+</body>
+</document>

Propchange: commons/proper/io/trunk/src/site/xdoc/upgradeto2_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java?rev=1302382&r1=1302381&r2=1302382&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java Mon Mar 19 11:50:35 2012
@@ -1,172 +1,172 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.io;
-
-import org.apache.commons.io.testtools.FileBasedTestCase;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * This class ensure the correctness of {@link FileUtils#directoryContains(File,File)}.
- * 
- * @see FileUtils#directoryContains(File, File)
- * @since 2.2
- * @version $Id$
- */
-public class FileUtilsDirectoryContainsTestCase extends FileBasedTestCase {
-
-    private File directory1;
-    private File directory2;
-    private File directory3;
-    private File file1; 
-    private File file1ByRelativeDirectory2; 
-    private File file2; 
-    private File file2ByRelativeDirectory1; 
-    private File file3;
-    final File top = getTestDirectory();
-
-    public FileUtilsDirectoryContainsTestCase(String name) {
-        super(name);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        top.mkdirs();
-
-        directory1 = new File(top, "directory1");
-        directory2 = new File(top, "directory2");
-        directory3 = new File(directory2, "directory3");
-
-        directory1.mkdir();
-        directory2.mkdir();
-        directory3.mkdir();
-
-        file1 = new File(directory1, "file1");
-        file2 = new File(directory2, "file2");
-        file3 = new File(top, "file3");
-
-        // Tests case with relative path
-        file1ByRelativeDirectory2 = new File(getTestDirectory(), "directory2/../directory1/file1");
-        file2ByRelativeDirectory1 = new File(getTestDirectory(), "directory1/../directory2/file2");
-
-        FileUtils.touch(file1);
-        FileUtils.touch(file2);
-        FileUtils.touch(file3);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        FileUtils.deleteDirectory(top);
-    }
-
-    @Test
-    public void testCanonicalPath() throws IOException {
-        assertTrue(FileUtils.directoryContains(directory1, file1ByRelativeDirectory2));
-        assertTrue(FileUtils.directoryContains(directory2, file2ByRelativeDirectory1));
-
-        assertFalse(FileUtils.directoryContains(directory1, file2ByRelativeDirectory1));
-        assertFalse(FileUtils.directoryContains(directory2, file1ByRelativeDirectory2));
-    }
-
-    @Test
-    public void testDirectoryContainsDirectory() throws IOException {
-        assertTrue(FileUtils.directoryContains(top, directory1));
-        assertTrue(FileUtils.directoryContains(top, directory2));
-        assertTrue(FileUtils.directoryContains(top, directory3));
-        assertTrue(FileUtils.directoryContains(directory2, directory3));
-    }
-
-    @Test
-    public void testDirectoryContainsFile() throws IOException {
-        assertTrue(FileUtils.directoryContains(directory1, file1));
-        assertTrue(FileUtils.directoryContains(directory2, file2));
-    }
-
-    @Test
-    public void testDirectoryDoesNotContainFile() throws IOException {
-        assertFalse(FileUtils.directoryContains(directory1, file2));
-        assertFalse(FileUtils.directoryContains(directory2, file1));
-
-        assertFalse(FileUtils.directoryContains(directory1, file3));
-        assertFalse(FileUtils.directoryContains(directory2, file3));
-    }
-
-    @Test
-    public void testDirectoryDoesNotContainsDirectory() throws IOException {
-        assertFalse(FileUtils.directoryContains(directory1, top));
-        assertFalse(FileUtils.directoryContains(directory2, top));
-        assertFalse(FileUtils.directoryContains(directory3, top));
-        assertFalse(FileUtils.directoryContains(directory3, directory2));
-    }
-
-    @Test
-    public void testDirectoryDoesNotExist() throws IOException {
-        final File dir = new File("DOESNOTEXIST");
-        assertFalse(dir.exists());
-        try {
-            assertFalse(FileUtils.directoryContains(dir, file1));
-            fail("Expected " + IllegalArgumentException.class.getName());
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testSameFile() throws IOException {
-        try {
-            assertTrue(FileUtils.directoryContains(file1, file1));
-            fail("Expected " + IllegalArgumentException.class.getName());
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-    }
-
-    @Test
-    public void testFileDoesNotExist() throws IOException {
-        assertFalse(FileUtils.directoryContains(top, null));
-        final File file = new File("DOESNOTEXIST");
-        assertFalse(file.exists());
-        assertFalse(FileUtils.directoryContains(top, file));
-    }
-
-    /**
-     * Test to demonstrate a file which does not exist returns false
-     * @throws IOException
-     */
-    @Test
-    public void testFileDoesNotExistBug() throws IOException {
-        final File file = new File(top, "DOESNOTEXIST");
-        assertTrue("Check directory exists", top.exists());
-        assertFalse("Check file does not exist", file.exists());
-        assertFalse("Direcory does not contain unrealized file", FileUtils.directoryContains(top, file));
-    }
-
-    @Test
-    public void testUnrealizedContainment() throws IOException {
-        final File dir = new File("DOESNOTEXIST");
-        final File file = new File(dir, "DOESNOTEXIST2");
-        assertFalse(dir.exists());
-        assertFalse(file.exists());
-        try {
-            assertTrue(FileUtils.directoryContains(dir, file));
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io;
+
+import org.apache.commons.io.testtools.FileBasedTestCase;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * This class ensure the correctness of {@link FileUtils#directoryContains(File,File)}.
+ * 
+ * @see FileUtils#directoryContains(File, File)
+ * @since 2.2
+ * @version $Id$
+ */
+public class FileUtilsDirectoryContainsTestCase extends FileBasedTestCase {
+
+    private File directory1;
+    private File directory2;
+    private File directory3;
+    private File file1; 
+    private File file1ByRelativeDirectory2; 
+    private File file2; 
+    private File file2ByRelativeDirectory1; 
+    private File file3;
+    final File top = getTestDirectory();
+
+    public FileUtilsDirectoryContainsTestCase(String name) {
+        super(name);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        top.mkdirs();
+
+        directory1 = new File(top, "directory1");
+        directory2 = new File(top, "directory2");
+        directory3 = new File(directory2, "directory3");
+
+        directory1.mkdir();
+        directory2.mkdir();
+        directory3.mkdir();
+
+        file1 = new File(directory1, "file1");
+        file2 = new File(directory2, "file2");
+        file3 = new File(top, "file3");
+
+        // Tests case with relative path
+        file1ByRelativeDirectory2 = new File(getTestDirectory(), "directory2/../directory1/file1");
+        file2ByRelativeDirectory1 = new File(getTestDirectory(), "directory1/../directory2/file2");
+
+        FileUtils.touch(file1);
+        FileUtils.touch(file2);
+        FileUtils.touch(file3);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        FileUtils.deleteDirectory(top);
+    }
+
+    @Test
+    public void testCanonicalPath() throws IOException {
+        assertTrue(FileUtils.directoryContains(directory1, file1ByRelativeDirectory2));
+        assertTrue(FileUtils.directoryContains(directory2, file2ByRelativeDirectory1));
+
+        assertFalse(FileUtils.directoryContains(directory1, file2ByRelativeDirectory1));
+        assertFalse(FileUtils.directoryContains(directory2, file1ByRelativeDirectory2));
+    }
+
+    @Test
+    public void testDirectoryContainsDirectory() throws IOException {
+        assertTrue(FileUtils.directoryContains(top, directory1));
+        assertTrue(FileUtils.directoryContains(top, directory2));
+        assertTrue(FileUtils.directoryContains(top, directory3));
+        assertTrue(FileUtils.directoryContains(directory2, directory3));
+    }
+
+    @Test
+    public void testDirectoryContainsFile() throws IOException {
+        assertTrue(FileUtils.directoryContains(directory1, file1));
+        assertTrue(FileUtils.directoryContains(directory2, file2));
+    }
+
+    @Test
+    public void testDirectoryDoesNotContainFile() throws IOException {
+        assertFalse(FileUtils.directoryContains(directory1, file2));
+        assertFalse(FileUtils.directoryContains(directory2, file1));
+
+        assertFalse(FileUtils.directoryContains(directory1, file3));
+        assertFalse(FileUtils.directoryContains(directory2, file3));
+    }
+
+    @Test
+    public void testDirectoryDoesNotContainsDirectory() throws IOException {
+        assertFalse(FileUtils.directoryContains(directory1, top));
+        assertFalse(FileUtils.directoryContains(directory2, top));
+        assertFalse(FileUtils.directoryContains(directory3, top));
+        assertFalse(FileUtils.directoryContains(directory3, directory2));
+    }
+
+    @Test
+    public void testDirectoryDoesNotExist() throws IOException {
+        final File dir = new File("DOESNOTEXIST");
+        assertFalse(dir.exists());
+        try {
+            assertFalse(FileUtils.directoryContains(dir, file1));
+            fail("Expected " + IllegalArgumentException.class.getName());
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testSameFile() throws IOException {
+        try {
+            assertTrue(FileUtils.directoryContains(file1, file1));
+            fail("Expected " + IllegalArgumentException.class.getName());
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testFileDoesNotExist() throws IOException {
+        assertFalse(FileUtils.directoryContains(top, null));
+        final File file = new File("DOESNOTEXIST");
+        assertFalse(file.exists());
+        assertFalse(FileUtils.directoryContains(top, file));
+    }
+
+    /**
+     * Test to demonstrate a file which does not exist returns false
+     * @throws IOException
+     */
+    @Test
+    public void testFileDoesNotExistBug() throws IOException {
+        final File file = new File(top, "DOESNOTEXIST");
+        assertTrue("Check directory exists", top.exists());
+        assertFalse("Check file does not exist", file.exists());
+        assertFalse("Direcory does not contain unrealized file", FileUtils.directoryContains(top, file));
+    }
+
+    @Test
+    public void testUnrealizedContainment() throws IOException {
+        final File dir = new File("DOESNOTEXIST");
+        final File file = new File(dir, "DOESNOTEXIST2");
+        assertFalse(dir.exists());
+        assertFalse(file.exists());
+        try {
+            assertTrue(FileUtils.directoryContains(dir, file));
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+}

Propchange: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=1302382&r1=1302381&r2=1302382&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 Mon Mar 19 11:50:35 2012
@@ -1,76 +1,76 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.io;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.Set;
-
-/**
- * Extends {@link Selector} with no-ops for testing.
- *  
- * @version $Id$
- */
-public class SelectorAdapter extends Selector {
-
-    @Override
-    public boolean isOpen() {
-        return false;
-    }
-
-    @Override
-    public SelectorProvider provider() {
-        return null;
-    }
-
-    @Override
-    public Set<SelectionKey> keys() {
-        return null;
-    }
-
-    @Override
-    public Set<SelectionKey> selectedKeys() {
-        return null;
-    }
-
-    @Override
-    public int selectNow() throws IOException {
-        return 0;
-    }
-
-    @Override
-    public int select(long timeout) throws IOException {
-        return 0;
-    }
-
-    @Override
-    public int select() throws IOException {
-        return 0;
-    }
-
-    @Override
-    public Selector wakeup() {
-        return null;
-    }
-
-    @Override
-    public void close() throws IOException {
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io;
+
+import java.io.IOException;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Set;
+
+/**
+ * Extends {@link Selector} with no-ops for testing.
+ *  
+ * @version $Id$
+ */
+public class SelectorAdapter extends Selector {
+
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
+
+    @Override
+    public SelectorProvider provider() {
+        return null;
+    }
+
+    @Override
+    public Set<SelectionKey> keys() {
+        return null;
+    }
+
+    @Override
+    public Set<SelectionKey> selectedKeys() {
+        return null;
+    }
+
+    @Override
+    public int selectNow() throws IOException {
+        return 0;
+    }
+
+    @Override
+    public int select(long timeout) throws IOException {
+        return 0;
+    }
+
+    @Override
+    public int select() throws IOException {
+        return 0;
+    }
+
+    @Override
+    public Selector wakeup() {
+        return null;
+    }
+
+    @Override
+    public void close() throws IOException {
+    }
+
+}

Propchange: commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml?rev=1302382&r1=1302381&r2=1302382&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml (original)
+++ commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml Mon Mar 19 11:50:35 2012
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<element>
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   
-
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   
-
-Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   
-
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
-</element>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<element>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   
+
+Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
+</element>

Propchange: commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileBOM.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml?rev=1302382&r1=1302381&r2=1302382&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml (original)
+++ commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml Mon Mar 19 11:50:35 2012
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<element>
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   
-
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   
-
-Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   
-
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
-</element>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<element>
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   
+
+Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo
+</element>

Propchange: commons/proper/io/trunk/src/test/resources/org/apache/commons/io/testfileNoBOM.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message