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

feat(test/gtest): add map type support for AssertNI/AssertIN (#4135)

Browse Source
This commit is contained in:
heansheng 2025-01-23 17:58:32 +08:00 committed by GitHub
parent f9c7eae23b
commit 20b1987828
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/gtest/gtest_util.go
View File

@ -220,7 +220,6 @@ func AssertLE(value, expect interface{}) {
// AssertIN checks `value` is IN `expect`. // AssertIN checks `value` is IN `expect`.
// The `expect` should be a slice, // The `expect` should be a slice,
// but the `value` can be a slice or a basic type variable. // but the `value` can be a slice or a basic type variable.
// TODO map support.
// TODO: gconv.Strings(0) is not [0] // TODO: gconv.Strings(0) is not [0]
func AssertIN(value, expect interface{}) { func AssertIN(value, expect interface{}) {
var ( var (
@ -249,6 +248,14 @@ func AssertIN(value, expect interface{}) {
expectStr = gconv.String(expect) expectStr = gconv.String(expect)
) )
passed = gstr.Contains(expectStr, valueStr) passed = gstr.Contains(expectStr, valueStr)
case reflect.Map:
expectMap := gconv.Map(expect)
for _, v1 := range gconv.Strings(value) {
if _, exists := expectMap[v1]; !exists {
passed = false
break
}
}
default: default:
panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind)) panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind))
} }
@ -260,7 +267,6 @@ func AssertIN(value, expect interface{}) {
// AssertNI checks `value` is NOT IN `expect`. // AssertNI checks `value` is NOT IN `expect`.
// The `expect` should be a slice, // The `expect` should be a slice,
// but the `value` can be a slice or a basic type variable. // but the `value` can be a slice or a basic type variable.
// TODO map support.
func AssertNI(value, expect interface{}) { func AssertNI(value, expect interface{}) {
var ( var (
passed = true passed = true
@ -287,6 +293,14 @@ func AssertNI(value, expect interface{}) {
expectStr = gconv.String(expect) expectStr = gconv.String(expect)
) )
passed = !gstr.Contains(expectStr, valueStr) passed = !gstr.Contains(expectStr, valueStr)
case reflect.Map:
expectMap := gconv.Map(expect)
for _, v1 := range gconv.Strings(value) {
if _, exists := expectMap[v1]; exists {
passed = false
break
}
}
default: default:
panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind)) panic(fmt.Sprintf(`[ASSERT] INVALID EXPECT VALUE TYPE: %v`, expectKind))
} }

16
test/gtest/gtest_z_unit_test.go
View File

@ -322,6 +322,22 @@ func TestAssertIN(t *testing.T) {
}) })
} }
func TestAssertIN_Map(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
t.AssertIN("k1", map[string]string{"k1": "v1", "k2": "v2"})
t.AssertIN(1, map[int64]string{1: "v1", 2: "v2"})
t.AssertIN([]string{"k1", "k2"}, map[string]string{"k1": "v1", "k2": "v2"})
})
}
func TestAssertNI_Map(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
t.AssertNI("k3", map[string]string{"k1": "v1", "k2": "v2"})
t.AssertNI(3, map[int64]string{1: "v1", 2: "v2"})
t.AssertNI([]string{"k3", "k4"}, map[string]string{"k1": "v1", "k2": "v2"})
})
}
func TestAssertNI(t *testing.T) { func TestAssertNI(t *testing.T) {
gtest.C(t, func(t *gtest.T) { gtest.C(t, func(t *gtest.T) {
t.AssertNI("d", []string{"a", "b", "c"}) t.AssertNI("d", []string{"a", "b", "c"})