zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-03-05 22:31:57 +08:00
parent 9eb982b7a6
commit 2ee6c0356a
27 changed files with 244 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package cn.hutool.core.io;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.io.file.LineSeparator;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharsetUtil;
@@ -53,22 +54,6 @@ public class FileUtilTest {
FileUtil.touch("d:\\tea\\a.jpg");
}
@Test
@Ignore
public void delTest() {
// 删除一个不存在的文件，应返回true
final boolean result = FileUtil.del("e:/Hutool_test_3434543533409843.txt");
Assert.assertTrue(result);
}
@Test
@Ignore
public void delTest2() {
// 删除一个不存在的文件，应返回true
final boolean result = FileUtil.del(Paths.get("e:/Hutool_test_3434543533409843.txt"));
Assert.assertTrue(result);
}
@Test
@Ignore
public void renameTest() {
@@ -317,61 +302,61 @@ public class FileUtilTest {
@Test
public void getNameTest() {
String path = "d:\\aaa\\bbb\\cc\\ddd\\";
String name = FileUtil.getName(path);
String name = FileNameUtil.getName(path);
Assert.assertEquals("ddd", name);
path = "d:\\aaa\\bbb\\cc\\ddd.jpg";
name = FileUtil.getName(path);
name = FileNameUtil.getName(path);
Assert.assertEquals("ddd.jpg", name);
}
@Test
public void mainNameTest() {
String path = "d:\\aaa\\bbb\\cc\\ddd\\";
String mainName = FileUtil.mainName(path);
String mainName = FileNameUtil.mainName(path);
Assert.assertEquals("ddd", mainName);
path = "d:\\aaa\\bbb\\cc\\ddd";
mainName = FileUtil.mainName(path);
mainName = FileNameUtil.mainName(path);
Assert.assertEquals("ddd", mainName);
path = "d:\\aaa\\bbb\\cc\\ddd.jpg";
mainName = FileUtil.mainName(path);
mainName = FileNameUtil.mainName(path);
Assert.assertEquals("ddd", mainName);
}
@Test
public void extNameTest() {
String path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd\\" : "~/Desktop/hutool/ddd/";
String mainName = FileUtil.extName(path);
String mainName = FileNameUtil.extName(path);
Assert.assertEquals("", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd" : "~/Desktop/hutool/ddd";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd.jpg" : "~/Desktop/hutool/ddd.jpg";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("jpg", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.xlsx" : "~/Desktop/hutool/fff.xlsx";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("xlsx", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.gz" : "~/Desktop/hutool/fff.tar.gz";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("tar.gz", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.Z" : "~/Desktop/hutool/fff.tar.Z";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("tar.Z", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.bz2" : "~/Desktop/hutool/fff.tar.bz2";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("tar.bz2", mainName);
path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.xz" : "~/Desktop/hutool/fff.tar.xz";
mainName = FileUtil.extName(path);
mainName = FileNameUtil.extName(path);
Assert.assertEquals("tar.xz", mainName);
}
@@ -445,10 +430,10 @@ public class FileUtilTest {
Assert.assertTrue(nullDirTempFile.exists());
final File suffixDirTempFile = FileUtil.createTempFile(".xlsx",true);
Assert.assertEquals("xlsx", FileUtil.getSuffix(suffixDirTempFile));
Assert.assertEquals("xlsx", FileNameUtil.getSuffix(suffixDirTempFile));
final File prefixDirTempFile = FileUtil.createTempFile("prefix",".xlsx",true);
Assert.assertTrue(FileUtil.getPrefix(prefixDirTempFile).startsWith("prefix"));
Assert.assertTrue(FileNameUtil.getPrefix(prefixDirTempFile).startsWith("prefix"));
}
@Test

9
hutool-core/src/test/java/cn/hutool/core/io/file/PathCopyTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.io.file;
import org.junit.Ignore;
import org.junit.Test;
import java.nio.file.Path;
@@ -11,6 +12,7 @@ import java.nio.file.Paths;
public class PathCopyTest {
@Test
@Ignore
public void copySameFileTest() {
final Path path = Paths.get("d:/test/dir1/test1.txt");
//src路径和target路径相同时，不执行操作
@@ -20,6 +22,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copySameDirTest() {
final Path path = Paths.get("d:/test/dir1");
//src路径和target路径相同时，不执行操作
@@ -29,6 +32,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyFileToDirTest() {
// src为文件，target为已存在目录，则拷贝到目录下，文件名不变。
PathUtil.copy(
@@ -37,6 +41,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyFileToPathNotExistTest() {
// src为文件，target为不存在路径，则目标以文件对待（自动创建父级目录）
// 相当于拷贝后重命名
@@ -46,6 +51,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyFileToFileTest() {
//src为文件，target是一个已存在的文件，则当{@link CopyOption}设为覆盖时会被覆盖，默认不覆盖。
PathUtil.copy(
@@ -54,6 +60,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyDirToDirTest() {
//src为目录，target为已存在目录，整个src目录连同其目录拷贝到目标目录中
PathUtil.copy(
@@ -62,6 +69,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyDirToPathNotExistTest() {
//src为目录，target为不存在路径，则自动创建目标为新目录，整个src目录连同其目录拷贝到目标目录中
PathUtil.copy(
@@ -70,6 +78,7 @@ public class PathCopyTest {
}
@Test
@Ignore
public void copyDirToFileTest() {
//src为目录，target为文件，抛出IllegalArgumentException
PathUtil.copy(

28
hutool-core/src/test/java/cn/hutool/core/io/file/PathDeleterTest.java Executable file
View File

@@ -0,0 +1,28 @@
package cn.hutool.core.io.file;
import cn.hutool.core.io.FileUtil;
import org.junit.Ignore;
import org.junit.Test;
import java.nio.file.Paths;
public class PathDeleterTest {
@Test
@Ignore
public void delFileTest() {
FileUtil.touch("d:/test/exist.txt");
PathUtil.del(Paths.get("d:/test/exist.txt"));
}
@Test
@Ignore
public void delDirTest() {
PathUtil.del(Paths.get("d:/test/dir1"));
}
@Test
@Ignore
public void cleanDirTest() {
PathUtil.clean(Paths.get("d:/test/dir1"));
}
}