server/beego
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Sonart PR1

Browse Source
This commit is contained in:
Ming Deng
2021-02-01 00:18:34 +08:00
parent 326fc5dd9c
commit 41d682d878
11 changed files with 142 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adapter/config/ini_test.go
View File

@@ -81,7 +81,8 @@ password = ${GOPATH}
}
)
f, err := os.Create("testini.conf")
cfgFile := "testini.conf"
f, err := os.Create(cfgFile)
if err != nil {
t.Fatal(err)
}
@@ -91,8 +92,8 @@ password = ${GOPATH}
t.Fatal(err)
}
f.Close()
defer os.Remove("testini.conf")
iniconf, err := NewConfig("ini", "testini.conf")
defer os.Remove(cfgFile)
iniconf, err := NewConfig("ini", cfgFile)
if err != nil {
t.Fatal(err)
}

14
adapter/config/json_test.go
View File

@@ -32,7 +32,8 @@ func TestJsonStartsWithArray(t *testing.T) {
"serviceAPI": "http://www.test.com/employee"
}
]`
f, err := os.Create("testjsonWithArray.conf")
cfgFileName := "testjsonWithArray.conf"
f, err := os.Create(cfgFileName)
if err != nil {
t.Fatal(err)
}
@@ -42,8 +43,8 @@ func TestJsonStartsWithArray(t *testing.T) {
t.Fatal(err)
}
f.Close()
defer os.Remove("testjsonWithArray.conf")
jsonconf, err := NewConfig("json", "testjsonWithArray.conf")
defer os.Remove(cfgFileName)
jsonconf, err := NewConfig("json", cfgFileName)
if err != nil {
t.Fatal(err)
}
@@ -132,7 +133,8 @@ func TestJson(t *testing.T) {
}
)
f, err := os.Create("testjson.conf")
cfgFileName := "testjson.conf"
f, err := os.Create(cfgFileName)
if err != nil {
t.Fatal(err)
}
@@ -142,8 +144,8 @@ func TestJson(t *testing.T) {
t.Fatal(err)
}
f.Close()
defer os.Remove("testjson.conf")
jsonconf, err := NewConfig("json", "testjson.conf")
defer os.Remove(cfgFileName)
jsonconf, err := NewConfig("json", cfgFileName)
if err != nil {
t.Fatal(err)
}

7
adapter/config/xml/xml_test.go
View File

@@ -58,7 +58,8 @@ func TestXML(t *testing.T) {
}
)
f, err := os.Create("testxml.conf")
cfgFileName := "testxml.conf"
f, err := os.Create(cfgFileName)
if err != nil {
t.Fatal(err)
}
@@ -68,9 +69,9 @@ func TestXML(t *testing.T) {
t.Fatal(err)
}
f.Close()
defer os.Remove("testxml.conf")
defer os.Remove(cfgFileName)
xmlconf, err := config.NewConfig("xml", "testxml.conf")
xmlconf, err := config.NewConfig("xml", cfgFileName)
if err != nil {
t.Fatal(err)
}

7
adapter/config/yaml/yaml_test.go
View File

@@ -54,7 +54,8 @@ func TestYaml(t *testing.T) {
"emptystrings": []string{},
}
)
f, err := os.Create("testyaml.conf")
cfgFileName := "testyaml.conf"
f, err := os.Create(cfgFileName)
if err != nil {
t.Fatal(err)
}
@@ -64,8 +65,8 @@ func TestYaml(t *testing.T) {
t.Fatal(err)
}
f.Close()
defer os.Remove("testyaml.conf")
yamlconf, err := config.NewConfig("yaml", "testyaml.conf")
defer os.Remove(cfgFileName)
yamlconf, err := config.NewConfig("yaml", cfgFileName)
if err != nil {
t.Fatal(err)
}