blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

style(gtest/test): improve code (#3891)

Browse Source
This commit is contained in:
oldme 2024-11-12 20:20:13 +08:00 committed by GitHub
parent a63af5d5f8
commit 070efecc6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
test/gtest/gtest_util.go
View File

@ -315,35 +315,44 @@ func compareMap(value, expect interface{}) error {
rvValue = reflect.ValueOf(value) rvValue = reflect.ValueOf(value)
rvExpect = reflect.ValueOf(expect) rvExpect = reflect.ValueOf(expect)
) )
if rvExpect.Kind() == reflect.Map {
if rvValue.Kind() == reflect.Map { if rvExpect.Kind() != reflect.Map {
if rvExpect.Len() == rvValue.Len() { return nil
// Turn two interface maps to the same type for comparison. }
// Direct use of rvValue.MapIndex(key).Interface() will panic
// when the key types are inconsistent. if rvValue.Kind() != reflect.Map {
mValue := make(map[string]string) return fmt.Errorf(`[ASSERT] EXPECT VALUE TO BE A MAP, BUT GIVEN "%s"`, rvValue.Kind())
mExpect := make(map[string]string) }
ksValue := rvValue.MapKeys()
ksExpect := rvExpect.MapKeys() if rvExpect.Len() != rvValue.Len() {
for _, key := range ksValue { return fmt.Errorf(`[ASSERT] EXPECT MAP LENGTH %d == %d`, rvValue.Len(), rvExpect.Len())
mValue[gconv.String(key.Interface())] = gconv.String(rvValue.MapIndex(key).Interface()) }
}
for _, key := range ksExpect { // Turn two interface maps to the same type for comparison.
mExpect[gconv.String(key.Interface())] = gconv.String(rvExpect.MapIndex(key).Interface()) // Direct use of rvValue.MapIndex(key).Interface() will panic
} // when the key types are inconsistent.
for k, v := range mExpect { var (
if v != mValue[k] { mValue = make(map[string]string)
return fmt.Errorf(`[ASSERT] EXPECT VALUE map["%v"]:%v == map["%v"]:%v`+ mExpect = make(map[string]string)
"\nGIVEN : %v\nEXPECT: %v", k, mValue[k], k, v, mValue, mExpect) ksValue = rvValue.MapKeys()
} ksExpect = rvExpect.MapKeys()
} )
} else {
return fmt.Errorf(`[ASSERT] EXPECT MAP LENGTH %d == %d`, rvValue.Len(), rvExpect.Len()) for _, key := range ksValue {
} mValue[gconv.String(key.Interface())] = gconv.String(rvValue.MapIndex(key).Interface())
} else { }
return fmt.Errorf(`[ASSERT] EXPECT VALUE TO BE A MAP, BUT GIVEN "%s"`, rvValue.Kind())
for _, key := range ksExpect {
mExpect[gconv.String(key.Interface())] = gconv.String(rvExpect.MapIndex(key).Interface())
}
for k, v := range mExpect {
if v != mValue[k] {
return fmt.Errorf(`[ASSERT] EXPECT VALUE map["%v"]:%v == map["%v"]:%v`+
"\nGIVEN : %v\nEXPECT: %v", k, mValue[k], k, v, mValue, mExpect)
} }
} }
return nil return nil
} }
@ -364,9 +373,9 @@ func AssertNil(value interface{}) {
// which will be joined with current system separator and returned with the path. // which will be joined with current system separator and returned with the path.
func DataPath(names ...string) string { func DataPath(names ...string) string {
_, path, _ := gdebug.CallerWithFilter([]string{pathFilterKey}) _, path, _ := gdebug.CallerWithFilter([]string{pathFilterKey})
path = filepath.Dir(path) + "/testdata" path = filepath.Join(filepath.Dir(path), "testdata")
for _, name := range names { for _, name := range names {
path += "/" + name path = filepath.Join(path, name)
} }
return filepath.FromSlash(path) return filepath.FromSlash(path)
} }

2
test/gtest/gtest_z_unit_test.go
View File

@ -399,7 +399,7 @@ func TestAssertError(t *testing.T) {
func TestDataPath(t *testing.T) { func TestDataPath(t *testing.T) {
gtest.C(t, func(t *gtest.T) { gtest.C(t, func(t *gtest.T) {
t.Assert(filepath.ToSlash(gtest.DataPath("testdata.txt")), `./testdata/testdata.txt`) t.Assert(filepath.ToSlash(gtest.DataPath("testdata.txt")), `testdata/testdata.txt`)
}) })
} }