Author: echatellier Date: 2010-01-25 17:08:00 +0100 (Mon, 25 Jan 2010) New Revision: 1754 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java trunk/src/test/java/org/nuiton/util/FileUtilTest.java Log: Fix end of file always lost bug. Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-25 14:52:16 UTC (rev 1753) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-25 16:08:00 UTC (rev 1754) @@ -1116,7 +1116,7 @@ // TODO is it a good way to write file ? fc.position(0); fc.write(ByteBuffer.wrap(outString.getBytes())); - fc.truncate(outString.length()); + fc.truncate(outString.getBytes().length); } finally { if (fc != null) { Modified: trunk/src/test/java/org/nuiton/util/FileUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-25 14:52:16 UTC (rev 1753) +++ trunk/src/test/java/org/nuiton/util/FileUtilTest.java 2010-01-25 16:08:00 UTC (rev 1754) @@ -217,11 +217,15 @@ File testUtilFile = FileUtil.find(testDirectory, ".*FileUtil\\.java", true).get(0); // real method to test here : sed - FileUtil.sed(".*\\*.*", "**removed**", testUtilFile , "UTF-8"); + FileUtil.sed(".*\\*.*", "** skipped **", testUtilFile , "UTF-8"); List<CharSequence> lines = FileUtil.grep("/var/tmp/bidulle", testUtilFile , "UTF-8"); Assert.assertNull(lines); + // test une presence en debut et fin de fichier + List<CharSequence> lines2 = FileUtil.grep("// FileUtil", testUtilFile , "UTF-8"); + Assert.assertEquals(2, lines2.size()); + // clean FileUtil.deleteRecursively(testDirectory); }