Looly 5 years ago
parent
commit
cf5ff51a56

+ 1 - 2
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java

@@ -59,7 +59,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
 import java.util.zip.CRC32;
@@ -273,7 +272,7 @@ public class FileUtil {
 	 * @param start    起始路径,必须为目录
 	 * @param maxDepth 最大遍历深度,-1表示不限制深度
 	 * @param visitor  {@link FileVisitor} 接口,用于自定义在访问文件时,访问目录前后等节点做的操作
-	 * @see Files#walkFileTree(Path, Set, int, FileVisitor)
+	 * @see Files#walkFileTree(Path, java.util.Set, int, FileVisitor)
 	 * @since 4.6.3
 	 */
 	public static void walkFiles(Path start, int maxDepth, FileVisitor<? super Path> visitor) {

+ 26 - 9
hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java

@@ -1,17 +1,16 @@
 package cn.hutool.core.io;
 
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-
+import cn.hutool.core.io.file.LineSeparator;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.CharsetUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import cn.hutool.core.io.file.LineSeparator;
-import cn.hutool.core.lang.Console;
-import cn.hutool.core.util.CharsetUtil;
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
 
 /**
  * {@link FileUtil} 单元测试类
@@ -87,7 +86,7 @@ public class FileUtilTest {
 
 	@Test
 	@Ignore
-	public void copyFilesFromDir() {
+	public void copyFilesFromDirTest() {
 		File srcFile = FileUtil.file("D:\\驱动");
 		File destFile = FileUtil.file("d:\\驱动备份");
 
@@ -95,6 +94,24 @@ public class FileUtilTest {
 	}
 
 	@Test
+	@Ignore
+	public void copyDirTest() {
+		File srcFile = FileUtil.file("D:\\test");
+		File destFile = FileUtil.file("E:\\");
+
+		FileUtil.copy(srcFile, destFile, true);
+	}
+
+	@Test
+	@Ignore
+	public void moveDirTest() {
+		File srcFile = FileUtil.file("E:\\test2");
+		File destFile = FileUtil.file("D:\\");
+
+		FileUtil.move(srcFile, destFile, true);
+	}
+
+	@Test
 	public void equlasTest() {
 		// 源文件和目标文件都不存在
 		File srcFile = FileUtil.file("d:/hutool.jpg");