From 054ef87886c9673bdca4cbc99c273f28ca6e018c Mon Sep 17 00:00:00 2001
From: "yybjroam@qq.com" <yybjroam@qq.com>
Date: Mon, 8 Apr 2019 23:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=B5=8B=E8=AF=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 g/os/gfile/gfile_test.go                      | 88 ++++++++++++++++++-
 .../{havefile1/ttm2.txt => delfile/t1.txt}    |  0
 .../{havefile1/ttn2.txt => dirfiles/t1.txt}   |  0
 g/os/gfile/testfile/dirfiles/t2.txt           |  0
 g/os/gfile/testfile/havefile1/copyfile1.txt   |  0
 g/os/gfile/testfile/havefile1/copyfile2.txt   |  0
 g/os/gfile/testfile/havefile1/ttm1.txt        |  0
 g/os/gfile/testfile/havefile1/ttn1.txt        |  0
 g/os/gfile/testfile/readme.txt                | 13 +++
 9 files changed, 100 insertions(+), 1 deletion(-)
 rename g/os/gfile/testfile/{havefile1/ttm2.txt => delfile/t1.txt} (100%)
 rename g/os/gfile/testfile/{havefile1/ttn2.txt => dirfiles/t1.txt} (100%)
 create mode 100644 g/os/gfile/testfile/dirfiles/t2.txt
 create mode 100644 g/os/gfile/testfile/havefile1/copyfile1.txt
 create mode 100644 g/os/gfile/testfile/havefile1/copyfile2.txt
 create mode 100644 g/os/gfile/testfile/havefile1/ttm1.txt
 create mode 100644 g/os/gfile/testfile/havefile1/ttn1.txt
 create mode 100644 g/os/gfile/testfile/readme.txt

diff --git a/g/os/gfile/gfile_test.go b/g/os/gfile/gfile_test.go
index 3bf08eae7..1a69a4dd4 100644
--- a/g/os/gfile/gfile_test.go
+++ b/g/os/gfile/gfile_test.go
@@ -3,6 +3,7 @@ package gfile
 import (
 	"github.com/gogf/gf/g/test/gtest"
 	"os"
+	"path/filepath"
 	"testing"
 )
 
@@ -285,7 +286,7 @@ func TestMove(t *testing.T) {
 		 )
 
 		 gtest.Assert(Rename(paths,topath),nil)
-		// gtest.Assert(IsFile(topath),true)
+		gtest.Assert(IsFile(topath),true)
 
 
 	 })
@@ -293,5 +294,90 @@ func TestMove(t *testing.T) {
 
  }
 
+func TestCopy(t *testing.T) {
+	gtest.Case(t, func(){
+		var(
+			paths string ="./testfile/havefile1/copyfile1.txt"
+			topath string ="./testfile/havefile1/copyfile2.txt"
+		)
+
+		gtest.Assert(Copy(paths,topath),nil)
+		gtest.Assert(IsFile(topath),true)
+
+
+	})
+}
+
+func  TestDirNames(t *testing.T)  {
+	gtest.Case(t, func(){
+		var(
+			paths string ="./testfile/dirfiles"
+			err error
+			readlist []string
+
+		)
+		havelist:=[]string{
+			"t1.txt",
+			"t2.txt",
+		}
+		readlist,err=DirNames(paths)
+
+		gtest.Assert(err,nil)
+		gtest.Assert(havelist,readlist)
+
+
+
+	})
+}
+
+
+func TestGlob(t *testing.T) {
+	gtest.Case(t, func(){
+		var(
+			paths string ="./testfile/dirfiles/*.txt"
+			err error
+			resultlist []string
+
+		)
+
+		havelist1:=[]string{
+			"t1.txt",
+			"t2.txt",
+		}
+
+		havelist2:=[]string{
+			"testfile/dirfiles/t1.txt",
+			"testfile/dirfiles/t2.txt",
+		}
+
+		resultlist,err=Glob(paths,true)
+		gtest.Assert(err,nil)
+		gtest.Assert(resultlist,havelist1)
+
+
+		resultlist,err=Glob(paths,false)
+
+		//转换成统一的目录分隔符
+		for k,v:=range resultlist{
+			resultlist[k]=filepath.ToSlash(v)
+		}
+		gtest.Assert(err,nil)
+		gtest.Assert(resultlist,havelist2)
+
+	})
+}
+
+func TestRemove(t *testing.T) {
+	gtest.Case(t, func(){
+		var(
+			paths string ="./testfile/delfile/t1.txt"
+
+		)
+
+		gtest.Assert(Remove(paths),nil)
+
+
+	})
+}
 
 
diff --git a/g/os/gfile/testfile/havefile1/ttm2.txt b/g/os/gfile/testfile/delfile/t1.txt
similarity index 100%
rename from g/os/gfile/testfile/havefile1/ttm2.txt
rename to g/os/gfile/testfile/delfile/t1.txt
diff --git a/g/os/gfile/testfile/havefile1/ttn2.txt b/g/os/gfile/testfile/dirfiles/t1.txt
similarity index 100%
rename from g/os/gfile/testfile/havefile1/ttn2.txt
rename to g/os/gfile/testfile/dirfiles/t1.txt
diff --git a/g/os/gfile/testfile/dirfiles/t2.txt b/g/os/gfile/testfile/dirfiles/t2.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/g/os/gfile/testfile/havefile1/copyfile1.txt b/g/os/gfile/testfile/havefile1/copyfile1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/g/os/gfile/testfile/havefile1/copyfile2.txt b/g/os/gfile/testfile/havefile1/copyfile2.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/g/os/gfile/testfile/havefile1/ttm1.txt b/g/os/gfile/testfile/havefile1/ttm1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/g/os/gfile/testfile/havefile1/ttn1.txt b/g/os/gfile/testfile/havefile1/ttn1.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/g/os/gfile/testfile/readme.txt b/g/os/gfile/testfile/readme.txt
new file mode 100644
index 000000000..f1608e27c
--- /dev/null
+++ b/g/os/gfile/testfile/readme.txt
@@ -0,0 +1,13 @@
+������ڵIJ����ļ�:
+
+delfile
+    t1.txt
+
+havefile1  
+    copyfile1.txt
+    ttn1.txt
+    ttm1.txt
+
+
+dirfiles
+     *
\ No newline at end of file