diff --git a/g/os/gfcache/gfcache_z_unit_test.go b/g/os/gfcache/gfcache_z_unit_test.go index 77b02403a..b45a1fe13 100755 --- a/g/os/gfcache/gfcache_z_unit_test.go +++ b/g/os/gfcache/gfcache_z_unit_test.go @@ -9,6 +9,7 @@ package gfcache_test import ( + "io/ioutil" "os" "testing" "time" @@ -23,43 +24,69 @@ func TestGetContents(t *testing.T) { var f *os.File var err error - fileName := "test.txt" + fileName := "test" strTest := "123" if !gfile.Exists(fileName) { - f, err = gfile.Create(fileName) + f, err = ioutil.TempFile("", fileName) if err != nil { t.Error("create file fail") } } - cache := gfcache.GetContents(fileName, 2) + defer f.Close() + defer os.Remove(f.Name()) - if gfile.Exists(fileName) { - f, err = gfile.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModeAppend) + if gfile.Exists(f.Name()) { + + f, err = gfile.OpenFile(f.Name(), os.O_APPEND|os.O_WRONLY, os.ModeAppend) if err != nil { t.Error("file open fail", err) } + + err = gfile.PutContents(f.Name(), strTest) + if err != nil { + t.Error("write error", err) + } + + cache := gfcache.GetContents(f.Name(), 1) + gtest.Assert(cache, strTest) + } + }) + + gtest.Case(t, func() { + + var f *os.File + var err error + fileName := "test2" + strTest := "123" + + if !gfile.Exists(fileName) { + f, err = ioutil.TempFile("", fileName) + if err != nil { + t.Error("create file fail") + } } defer f.Close() + defer os.Remove(f.Name()) - _, err = f.Write([]byte(strTest)) - if err != nil { - t.Error("write error", err) - } + if gfile.Exists(f.Name()) { + cache := gfcache.GetContents(f.Name()) - cache = gfcache.GetContents(fileName) - gtest.Assert(cache, "") - - time.Sleep(time.Duration(4) * time.Second) - - if gfile.Exists(fileName) { - err = gfile.Remove(fileName) + f, err = gfile.OpenFile(f.Name(), os.O_APPEND|os.O_WRONLY, os.ModeAppend) if err != nil { - t.Error("file remove fail", err) + t.Error("file open fail", err) } + + err = gfile.PutContents(f.Name(), strTest) + if err != nil { + t.Error("write error", err) + } + + gtest.Assert(cache, "") + + time.Sleep(100 * time.Millisecond) } }) - } diff --git a/g/util/gvalid/gvalid_unit_basic_all_test.go b/g/util/gvalid/gvalid_unit_basic_all_test.go index 10731887a..7345e69de 100755 --- a/g/util/gvalid/gvalid_unit_basic_all_test.go +++ b/g/util/gvalid/gvalid_unit_basic_all_test.go @@ -24,9 +24,9 @@ func Test_Check(t *testing.T) { err1 := gvalid.Check(val1, rule, nil) err2 := gvalid.Check(val2, rule, nil) err3 := gvalid.Check(val3, rule, nil) - gtest.AssertNE(err1, nil) - gtest.AssertNE(err2, nil) - gtest.AssertNE(err3, nil) + gtest.Assert(err1, "invalid rules:abc:6,16") + gtest.Assert(err2, "invalid rules:abc:6,16") + gtest.Assert(err3, "invalid rules:abc:6,16") }) }