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

Don't panic when underlying type is not .IsNil()-able (eg. string)

pull/14/head
Joshua Elliott 2013-05-23 14:54:54 -06:00
parent 3df0bce8cb
commit d35afcda84
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assert/assertions.go
View File

@ -173,8 +173,12 @@ func NotNil(t *testing.T, object interface{}, msgAndArgs ...interface{}) bool {
if object == nil { if object == nil {
success = false success = false
} else if reflect.ValueOf(object).IsNil() { } else {
success = false value := reflect.ValueOf(object)
kind := value.Kind()
if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
success = false
}
} }
if !success { if !success {
@ -201,8 +205,12 @@ func Nil(t *testing.T, object interface{}, msgAndArgs ...interface{}) bool {
if object == nil { if object == nil {
return true return true
} else if reflect.ValueOf(object).IsNil() { } else {
return true value := reflect.ValueOf(object)
kind := value.Kind()
if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
return true
}
} }
if len(message) > 0 { if len(message) > 0 {