GOMODULES
/
testify
mirror of https://github.com/stretchr/testify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor includeElement method

pull/618/merge
apantykhin 2018-12-23 22:38:16 +04:00 committed by George Lesica
parent ffdc059bfe
commit 834f27f4b7
1 changed files with 4 additions and 3 deletions

7
assert/assertions.go
View File

@ -629,7 +629,7 @@ func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{
func includeElement(list interface{}, element interface{}) (ok, found bool) { func includeElement(list interface{}, element interface{}) (ok, found bool) {
listValue := reflect.ValueOf(list) listValue := reflect.ValueOf(list)
elementValue := reflect.ValueOf(element) listValueKind := listValue.Kind()
defer func() { defer func() {
if e := recover(); e != nil { if e := recover(); e != nil {
ok = false ok = false
@ -637,11 +637,12 @@ func includeElement(list interface{}, element interface{}) (ok, found bool) {
} }
}() }()
if reflect.TypeOf(list).Kind() == reflect.String { if listValueKind == reflect.String {
elementValue := reflect.ValueOf(element)
return true, strings.Contains(listValue.String(), elementValue.String()) return true, strings.Contains(listValue.String(), elementValue.String())
} }
if reflect.TypeOf(list).Kind() == reflect.Map { if listValueKind == reflect.Map {
mapKeys := listValue.MapKeys() mapKeys := listValue.MapKeys()
for i := 0; i < len(mapKeys); i++ { for i := 0; i < len(mapKeys); i++ {
if ObjectsAreEqual(mapKeys[i].Interface(), element) { if ObjectsAreEqual(mapKeys[i].Interface(), element) {