diff --git a/g/os/gfile/gfile_contents_test.go b/g/os/gfile/gfile_contents_test.go index f86755cfb..80d3a5f32 100644 --- a/g/os/gfile/gfile_contents_test.go +++ b/g/os/gfile/gfile_contents_test.go @@ -37,7 +37,7 @@ func TestGetContents(t *testing.T) { ) CreateTestFile(filepaths,"my name is jroam") - gtest.Assert(GetContents(filepaths), "my name is jroam") + gtest.Assert(GetContents(os.TempDir()+filepaths), "my name is jroam") gtest.Assert(GetContents(""), "") defer DelTestFiles(filepaths) @@ -53,7 +53,7 @@ func TestGetBinContents(t *testing.T) { str1 string="my name is jroam" ) CreateTestFile(filepaths1,str1) - readcontent = GetBinContents(filepaths1) + readcontent = GetBinContents(os.TempDir()+filepaths1) gtest.Assert(readcontent, []byte(str1)) readcontent = GetBinContents(filepaths2) @@ -78,7 +78,7 @@ func TestTruncate(t *testing.T) { ) CreateTestFile(filepaths1,"abcdefghijkmln") defer DelTestFiles(filepaths1) - err = Truncate(filepaths1, 200) + err = Truncate(os.TempDir()+filepaths1, 200) gtest.Assert(err, nil) err = Truncate("", 200) @@ -98,13 +98,13 @@ func TestPutContents(t *testing.T) { CreateTestFile(filepaths,"a") defer DelTestFiles(filepaths) - err = PutContents(filepaths, "test!") + err = PutContents(os.TempDir()+filepaths, "test!") gtest.Assert(err, nil) //==================判断是否真正写入 - readcontent, err = ioutil.ReadFile(filepaths) + readcontent, err = ioutil.ReadFile(os.TempDir()+filepaths) gtest.Assert(err, nil) - gtest.Assert(string(readcontent), "atest!") + gtest.Assert(string(readcontent), "test!") err = PutContents("", "test!") gtest.AssertNE(err, nil) @@ -123,11 +123,11 @@ func TestPutContentsAppend(t *testing.T) { CreateTestFile(filepaths,"a") defer DelTestFiles(filepaths) - err = PutContentsAppend(filepaths, "hello") + err = PutContentsAppend(os.TempDir()+filepaths, "hello") gtest.Assert(err, nil) //==================判断是否真正写入 - readcontent, err = ioutil.ReadFile(filepaths) + readcontent, err = ioutil.ReadFile(os.TempDir()+filepaths) gtest.Assert(err, nil) gtest.Assert(string(readcontent), "ahello") @@ -150,13 +150,13 @@ func TestPutBinContents(t *testing.T) { CreateTestFile(filepaths,"a") defer DelTestFiles(filepaths) - err = PutBinContents(filepaths, []byte("test!!")) + err = PutBinContents(os.TempDir()+filepaths, []byte("test!!")) gtest.Assert(err, nil) //==================判断是否真正写入 - readcontent, err = ioutil.ReadFile(filepaths) + readcontent, err = ioutil.ReadFile(os.TempDir()+filepaths) gtest.Assert(err, nil) - gtest.Assert(string(readcontent), "atest!!") + gtest.Assert(string(readcontent), "test!!") err = PutBinContents("", []byte("test!!")) gtest.AssertNE(err, nil) @@ -173,13 +173,13 @@ func TestPutBinContentsAppend(t *testing.T) { err error readcontent []byte ) - CreateTestFile(filepaths,"") + CreateTestFile(filepaths,"test!!") defer DelTestFiles(filepaths) - err = PutBinContentsAppend(filepaths, []byte("word")) + err = PutBinContentsAppend(os.TempDir()+filepaths, []byte("word")) gtest.Assert(err, nil) //==================判断是否真正写入 - readcontent, err = ioutil.ReadFile(filepaths) + readcontent, err = ioutil.ReadFile(os.TempDir()+filepaths) gtest.Assert(err, nil) gtest.Assert(string(readcontent), "test!!word") @@ -200,7 +200,7 @@ func TestGetBinContentsByTwoOffsetsByPath(t *testing.T) { CreateTestFile(filepaths,"abcdefghijk") defer DelTestFiles(filepaths) - readcontent = GetBinContentsByTwoOffsetsByPath(filepaths, 2, 5) + readcontent = GetBinContentsByTwoOffsetsByPath(os.TempDir()+filepaths, 2, 5) gtest.Assert(string(readcontent), "cde") @@ -220,7 +220,7 @@ func TestGetNextCharOffsetByPath(t *testing.T) { ) CreateTestFile(filepaths,"abcdefghijk") defer DelTestFiles(filepaths) - localindex = GetNextCharOffsetByPath(filepaths, 'd', 1) + localindex = GetNextCharOffsetByPath(os.TempDir()+filepaths, 'd', 1) gtest.Assert(localindex, 3) localindex = GetNextCharOffsetByPath("", 'd', 1) @@ -291,13 +291,13 @@ func TestGetBinContentsTilCharByPath(t *testing.T) { CreateTestFile(filepaths,"abcdefghijklmn") defer DelTestFiles(filepaths) - reads, _ = GetBinContentsTilCharByPath(filepaths, 'c', 2) + reads, _ = GetBinContentsTilCharByPath(os.TempDir()+filepaths, 'c', 2) gtest.Assert(string(reads), "c") - reads, _ = GetBinContentsTilCharByPath(filepaths, 'y', 1) + reads, _ = GetBinContentsTilCharByPath(os.TempDir()+filepaths, 'y', 1) gtest.Assert(string(reads), "") - _, indexs = GetBinContentsTilCharByPath(filepaths, 'x', 1) + _, indexs = GetBinContentsTilCharByPath(os.TempDir()+filepaths, 'x', 1) gtest.Assert(indexs, -1) diff --git a/g/os/gfile/gfile_search_test.go b/g/os/gfile/gfile_search_test.go index 6e3b881ea..ef8b8fea7 100644 --- a/g/os/gfile/gfile_search_test.go +++ b/g/os/gfile/gfile_search_test.go @@ -2,8 +2,8 @@ package gfile import ( "github.com/gogf/gf/g/test/gtest" + "os" "path/filepath" - "strings" "testing" ) @@ -21,27 +21,47 @@ func TestSearch(t *testing.T) { CreateDir(paths1) defer DelTestFiles(paths1) - tpath, err = Search(paths1) + + + tpath, err = Search(os.TempDir()+paths1) gtest.Assert(err, nil) tpath = filepath.ToSlash(tpath) //==================自定义优先路径 + tpath2, err = Search(os.TempDir()+paths1) + gtest.Assert(err, nil) + tpath2 = filepath.ToSlash(tpath2) - tpath2, err = Search(paths1, "./") + + //tempstr, _ = filepath.Abs("./") + tempstr=os.TempDir() + paths1 = tempstr + paths1 + paths1 = filepath.ToSlash(paths1) + //paths1 = strings.Replace(paths1, "./", "/", 1) + + gtest.Assert(tpath, paths1) + + gtest.Assert(tpath2, tpath) + + + //测试当前目录 + tpath2, err = Search(os.TempDir()+paths1,"./") gtest.Assert(err, nil) tpath2 = filepath.ToSlash(tpath2) //测试当前目录 tempstr, _ = filepath.Abs("./") + tempstr=os.TempDir() paths1 = tempstr + paths1 paths1 = filepath.ToSlash(paths1) - paths1 = strings.Replace(paths1, "./", "/", 1) - - gtest.Assert(tpath, paths1) gtest.Assert(tpath2, paths1) + + + + //测试目录不存在时 _, err = Search(paths2) gtest.AssertNE(err, nil) diff --git a/g/os/gfile/gfile_size_test.go b/g/os/gfile/gfile_size_test.go index 0553ceeae..38b09308e 100644 --- a/g/os/gfile/gfile_size_test.go +++ b/g/os/gfile/gfile_size_test.go @@ -4,17 +4,22 @@ package gfile import ( "github.com/gogf/gf/g/test/gtest" + "os" "testing" ) func TestSize(t *testing.T) { gtest.Case(t, func() { var ( - paths1 string = "./testfile/dirfiles/t1.txt" + paths1 string = "/testfile_t1.txt" sizes int64 ) - sizes = Size(paths1) - gtest.Assert(sizes, 16) + + CreateTestFile(paths1, "abcdefghijklmn") + defer DelTestFiles(paths1) + + sizes = Size(os.TempDir() + paths1) + gtest.Assert(sizes, 14) sizes = Size("") gtest.Assert(sizes, 0) @@ -44,7 +49,12 @@ func TestFormatSize(t *testing.T) { func TestReadableSize(t *testing.T) { gtest.Case(t, func() { - gtest.Assert(ReadableSize("./testfile/dirfiles/t1.txt"), "16.00B") + var ( + paths1 string = "/testfile_t1.txt" + ) + CreateTestFile(paths1, "abcdefghijklmn") + defer DelTestFiles(paths1) + gtest.Assert(ReadableSize(os.TempDir()+paths1), "14.00B") gtest.Assert(ReadableSize(""), "0.00B") }) diff --git a/g/os/gfile/gfile_test.go b/g/os/gfile/gfile_test.go index b2bc3916e..b834913e2 100644 --- a/g/os/gfile/gfile_test.go +++ b/g/os/gfile/gfile_test.go @@ -15,7 +15,7 @@ func TestIsDir(t *testing.T) { CreateDir(paths) defer DelTestFiles(paths) - gtest.Assert(IsDir(paths), true) + gtest.Assert(IsDir(os.TempDir()+paths), true) gtest.Assert(IsDir("./testfile2"), false) gtest.Assert(IsDir("./testfile/tt.txt"), false) gtest.Assert(IsDir(""), false) @@ -72,7 +72,7 @@ func TestOpen(t *testing.T) { flags = append(flags, false) for k, v := range files { - fileobj, err = Open(v) + fileobj, err = Open(os.TempDir()+v) fileobj.Close() if flags[k] { gtest.Assert(err, nil) @@ -108,7 +108,7 @@ func TestOpenFile(t *testing.T) { flags = append(flags, true) for k, v := range files { - fileobj, err = OpenFile(v, os.O_RDWR, 0666) + fileobj, err = OpenFile(os.TempDir()+v, os.O_RDWR, 0666) fileobj.Close() if flags[k] { gtest.Assert(err, nil) @@ -140,7 +140,7 @@ func TestOpenWithFlag(t *testing.T) { flags = append(flags, false) for k, v := range files { - fileobj, err = OpenWithFlag(v, os.O_RDWR) + fileobj, err = OpenWithFlag(os.TempDir()+v, os.O_RDWR) fileobj.Close() if flags[k] { gtest.Assert(err, nil) @@ -173,7 +173,7 @@ func TestOpenWithFlagPerm(t *testing.T) { flags = append(flags, false) for k, v := range files { - fileobj, err = OpenWithFlagPerm(v, os.O_RDWR, 666) + fileobj, err = OpenWithFlagPerm(os.TempDir()+v, os.O_RDWR, 666) fileobj.Close() if flags[k] { gtest.Assert(err, nil) @@ -208,7 +208,7 @@ func TestExists(t *testing.T) { flags = append(flags, false) for k, v := range files { - flag = Exists(v) + flag = Exists(os.TempDir()+v) if flags[k] { gtest.Assert(flag, true) } else { @@ -255,7 +255,7 @@ func TestIsFile(t *testing.T) { flags = append(flags, false) for k, v := range files { - flag = IsFile(v) + flag = IsFile(os.TempDir()+v) if flags[k] { gtest.Assert(flag, true) } else { @@ -278,10 +278,10 @@ func TestInfo(t *testing.T) { CreateTestFile(paths,"") defer DelTestFiles(paths) - files, err = Info(paths) + files, err = Info(os.TempDir()+paths) gtest.Assert(err, nil) - files2, err = os.Stat(paths) + files2, err = os.Stat(os.TempDir()+paths) gtest.Assert(err, nil) gtest.Assert(files, files2) @@ -333,7 +333,7 @@ func TestCopy(t *testing.T) { CreateTestFile(paths,"") defer DelTestFiles(paths) - gtest.Assert(Copy(paths, topath), nil) + gtest.Assert(Copy(os.TempDir()+paths, topath), nil) defer DelTestFiles(topath) gtest.Assert(IsFile(topath), true) @@ -398,8 +398,8 @@ func TestGlob(t *testing.T) { } havelist2 := []string{ - "testfiles/t1.txt", - "testfiles/t2.txt", + os.TempDir()+"testfiles/t1.txt", + os.TempDir()+"testfiles/t2.txt", } //===============================构建测试文件 @@ -411,11 +411,11 @@ func TestGlob(t *testing.T) { - resultlist, err = Glob(paths, true) + resultlist, err = Glob(os.TempDir()+paths, true) gtest.Assert(err, nil) gtest.Assert(resultlist, havelist1) - resultlist, err = Glob(paths, false) + resultlist, err = Glob(os.TempDir()+paths, false) //转换成统一的目录分隔符 for k, v := range resultlist { diff --git a/g/os/gfile/gfile_time_test.go b/g/os/gfile/gfile_time_test.go index 241c27611..ed4fb5e38 100644 --- a/g/os/gfile/gfile_time_test.go +++ b/g/os/gfile/gfile_time_test.go @@ -11,17 +11,16 @@ func TestMTime(t *testing.T) { gtest.Case(t, func() { var ( - file1 string ="/testfile_t1.txt" - err error + file1 string = "/testfile_t1.txt" + err error fileobj os.FileInfo ) - CreateTestFile(file1,"") - defer DelTestFiles(file1) - fileobj, err = os.Stat(os.TempDir()+file1) + CreateTestFile(file1, "") + defer DelTestFiles(file1) + fileobj, err = os.Stat(os.TempDir() + file1) gtest.Assert(err, nil) - gtest.AssertGT(MTime(os.TempDir()+file1), fileobj.ModTime().Unix()) gtest.Assert(MTime(""), 0) }) @@ -30,20 +29,18 @@ func TestMTime(t *testing.T) { func TestMTimeMillisecond(t *testing.T) { gtest.Case(t, func() { var ( - file1 string ="/testfile_t1.txt" - err error + file1 string = "/testfile_t1.txt" + err error fileobj os.FileInfo ) - CreateTestFile(file1,"") - defer DelTestFiles(file1) - fileobj, err = os.Stat(os.TempDir()+file1) + CreateTestFile(file1, "") + defer DelTestFiles(file1) + fileobj, err = os.Stat(os.TempDir() + file1) gtest.Assert(err, nil) - - //这里本不为0,但github中的ci测试时，值为0 - gtest.AssertGTE(MTimeMillisecond(os.TempDir()+file1),fileobj.ModTime().Nanosecond()/1000000) + gtest.AssertGTE(MTimeMillisecond(os.TempDir()+file1), fileobj.ModTime().Nanosecond()/1000000) gtest.Assert(MTimeMillisecond(""), 0) }) } diff --git a/go.mod b/go.mod index ef37cb8d6..081d99cd0 100644 --- a/go.mod +++ b/go.mod @@ -1 +1,3 @@ module github.com/gogf/gf + +go 1.12