zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

FileUtil.getTotalLines()支持CR换行符

Browse Source
This commit is contained in:
Looly
2024-08-29 09:50:07 +08:00
parent 63b2f7c70d
commit c459a0f613
5 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
View File

@@ -532,6 +532,20 @@ public class FileUtilTest {
assertEquals(8, totalLines);
}
@Test
public void getTotalLinesCrTest() {
// 此文件最后一行有换行符，则最后的空行算作一行
final int totalLines = FileUtil.getTotalLines(FileUtil.file("test_lines_cr.csv"));
assertEquals(8, totalLines);
}
@Test
public void getTotalLinesCrlfTest() {
// 此文件最后一行有换行符，则最后的空行算作一行
final int totalLines = FileUtil.getTotalLines(FileUtil.file("test_lines_crlf.csv"));
assertEquals(8, totalLines);
}
@Test
public void issue3591Test() {
// 此文件最后一行末尾无换行符

1
hutool-core/src/test/resources/test_lines_cr.csv Normal file
View File

@@ -0,0 +1 @@
# 这是一行注释，读取时应忽略
Can't render this file because it contains an unexpected character in line 1 and column 141.

7
hutool-core/src/test/resources/test_lines_crlf.csv Normal file
View File

@@ -0,0 +1,7 @@
# 这是一行注释，读取时应忽略
a,b,c,d
1,2,3,4
# 这是一行注释，读取时应忽略
q,w,e,r,"我是一段
带换行的内容"
a,s,d,f
Can't render this file because it has a wrong number of fields in line 2.