From 08550d413ec6deb710a20958f0ba2a9628a08f03 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 4 Apr 2019 09:18:43 +0800 Subject: [PATCH] update unit test cases for gcfg --- g/frame/gins/gins_config_test.go | 57 +++++++++++++++++--------------- g/os/gcfg/gcfg.go | 10 ++++-- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/g/frame/gins/gins_config_test.go b/g/frame/gins/gins_config_test.go index 1bd96d29b..872e6f8bc 100644 --- a/g/frame/gins/gins_config_test.go +++ b/g/frame/gins/gins_config_test.go @@ -7,13 +7,13 @@ package gins_test import ( - "fmt" - "github.com/gogf/gf/g/frame/gins" - "github.com/gogf/gf/g/os/gfile" - "github.com/gogf/gf/g/os/gtime" - "github.com/gogf/gf/g/test/gtest" - "testing" - "time" + "fmt" + "github.com/gogf/gf/g/frame/gins" + "github.com/gogf/gf/g/os/gfile" + "github.com/gogf/gf/g/os/gtime" + "github.com/gogf/gf/g/test/gtest" + "testing" + "time" ) func Test_Config(t *testing.T) { @@ -51,6 +51,7 @@ test = "v=1" gtest.Case(t, func() { gtest.AssertNE(gins.Config(), nil) }) + // relative path gtest.Case(t, func() { path := "config.toml" @@ -84,10 +85,11 @@ test = "v=1" err := gfile.PutContents(path, config) gtest.Assert(err, nil) defer gfile.Remove(path) - defer gins.Config().Clear() - gtest.Assert(gins.Config("test.toml").Get("test"), "v=1") - gtest.Assert(gins.Config("test.toml").Get("database.default.1.host"), "127.0.0.1") - gtest.Assert(gins.Config("test.toml").Get("redis.disk"), "127.0.0.1:6379,0") + defer gins.Config("test").Clear() + gins.Config("test").SetFileName("test.toml") + gtest.Assert(gins.Config("test").Get("test"), "v=1") + gtest.Assert(gins.Config("test").Get("database.default.1.host"), "127.0.0.1") + gtest.Assert(gins.Config("test").Get("redis.disk"), "127.0.0.1:6379,0") }) // for gfsnotify callbacks to refresh cache of config file time.Sleep(500*time.Millisecond) @@ -97,10 +99,11 @@ test = "v=1" err := gfile.PutContents(path, config) gtest.Assert(err, nil) defer gfile.Remove(path) - defer gins.Config().Clear() - gtest.Assert(gins.Config("test.toml").Get("test"), "v=1") - gtest.Assert(gins.Config("test.toml").Get("database.default.1.host"), "127.0.0.1") - gtest.Assert(gins.Config("test.toml").Get("redis.disk"), "127.0.0.1:6379,0") + defer gins.Config("test").Clear() + gins.Config("test").SetFileName("test.toml") + gtest.Assert(gins.Config("test").Get("test"), "v=1") + gtest.Assert(gins.Config("test").Get("database.default.1.host"), "127.0.0.1") + gtest.Assert(gins.Config("test").Get("redis.disk"), "127.0.0.1:6379,0") }) // for gfsnotify callbacks to refresh cache of config file time.Sleep(500*time.Millisecond) @@ -141,12 +144,12 @@ test = "v=1" err := gfile.PutContents(file, config) gtest.Assert(err, nil) defer gfile.Remove(file) - defer gins.Config("test.toml").Clear() - - gtest.Assert(gins.Config("test.toml").AddPath(path), nil) - gtest.Assert(gins.Config("test.toml").Get("test"), "v=1") - gtest.Assert(gins.Config("test.toml").Get("database.default.1.host"), "127.0.0.1") - gtest.Assert(gins.Config("test.toml").Get("redis.disk"), "127.0.0.1:6379,0") + defer gins.Config("test").Clear() + gins.Config("test").SetFileName("test.toml") + gtest.Assert(gins.Config("test").AddPath(path), nil) + gtest.Assert(gins.Config("test").Get("test"), "v=1") + gtest.Assert(gins.Config("test").Get("database.default.1.host"), "127.0.0.1") + gtest.Assert(gins.Config("test").Get("redis.disk"), "127.0.0.1:6379,0") }) time.Sleep(500*time.Millisecond) @@ -156,11 +159,11 @@ test = "v=1" err := gfile.PutContents(file, config) gtest.Assert(err, nil) defer gfile.Remove(file) - defer gins.Config("test.toml").Clear() - - gtest.Assert(gins.Config("test.toml").AddPath(path), nil) - gtest.Assert(gins.Config("test.toml").Get("test"), "v=1") - gtest.Assert(gins.Config("test.toml").Get("database.default.1.host"), "127.0.0.1") - gtest.Assert(gins.Config("test.toml").Get("redis.disk"), "127.0.0.1:6379,0") + defer gins.Config().Clear() + gins.Config("test").SetFileName("test.toml") + gtest.Assert(gins.Config("test").AddPath(path), nil) + gtest.Assert(gins.Config("test").Get("test"), "v=1") + gtest.Assert(gins.Config("test").Get("database.default.1.host"), "127.0.0.1") + gtest.Assert(gins.Config("test").Get("redis.disk"), "127.0.0.1:6379,0") }) } diff --git a/g/os/gcfg/gcfg.go b/g/os/gcfg/gcfg.go index 76da73e1f..577a174e8 100644 --- a/g/os/gcfg/gcfg.go +++ b/g/os/gcfg/gcfg.go @@ -84,8 +84,12 @@ func (c *Config) filePath(file...string) (path string) { if c.paths.Len() > 0 { buffer.WriteString(fmt.Sprintf("[gcfg] cannot find config file \"%s\" in following paths:", name)) c.paths.RLockFunc(func(array []string) { - for k, v := range array { - buffer.WriteString(fmt.Sprintf("\n%d. %s",k + 1, v)) + index := 1 + for _, v := range array { + buffer.WriteString(fmt.Sprintf("\n%d. %s", index, v)) + index++ + buffer.WriteString(fmt.Sprintf("\n%d. %s%s%s", index, v, gfile.Separator, "config")) + index++ } }) } else { @@ -174,7 +178,7 @@ func (c *Config) AddPath(path string) error { buffer.WriteString(fmt.Sprintf("[gcfg] AddPath failed: cannot find directory \"%s\" in following paths:", path)) c.paths.RLockFunc(func(array []string) { for k, v := range array { - buffer.WriteString(fmt.Sprintf("\n%d. %s",k + 1, v)) + buffer.WriteString(fmt.Sprintf("\n%d. %s", k + 1, v)) } }) } else {