GOMODULES/testify
1
0
Fork 0
mirror of https://github.com/stretchr/testify.git synced 2025-05-31 11:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from jcelliott/master

Browse Source 
Fix typo in doc.go and Fix panic in (Not)?Nil()
This commit is contained in:
matryer 2013-06-05 11:09:19 -07:00
commit 4e4760bad4
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
assert/assertions.go
View File

@ -173,9 +173,13 @@ 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 {
value := reflect.ValueOf(object)
kind := value.Kind()
if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
success = false success = false
} }
}
if !success { if !success {
@ -201,9 +205,13 @@ 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 {
value := reflect.ValueOf(object)
kind := value.Kind()
if kind >= reflect.Chan && kind <= reflect.Slice && value.IsNil() {
return true return true
} }
}
if len(message) > 0 { if len(message) > 0 {
t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\tExpected nil, but got: %#v\n\r\tMessages:\t%s\n\r", getWhitespaceString(), CallerInfo(), object, message) t.Errorf("\r%s\r\tLocation:\t%s\n\r\tError:\t\tExpected nil, but got: %#v\n\r\tMessages:\t%s\n\r", getWhitespaceString(), CallerInfo(), object, message)

2
assert/doc.go
View File

@ -47,7 +47,7 @@
// //
// assert.Error(t, errorObject [, message [, format-args]]) // assert.Error(t, errorObject [, message [, format-args]])
// //
// assert.NotError(t, errorObject [, message [, format-args]]) // assert.NoError(t, errorObject [, message [, format-args]])
// //
// assert.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]]) // assert.Implements(t, (*MyInterface)(nil), new(MyObject) [,message [, format-args]])
// //