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

Revert "Fixes #13" 

This reverts commit 9b28fe8965.
pull/14/merge
Mat Ryer 2012-12-04 13:11:45 -07:00
parent 9b28fe8965
commit 841b040dd7
2 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assert/assertions.go
View File

@ -173,13 +173,8 @@ 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() {
success = false
val := reflect.ValueOf(object)
if val.CanAddr() {
if reflect.ValueOf(object).IsNil() {
success = false
}
} }
if !success { if !success {
@ -206,13 +201,8 @@ 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() {
return true
val := reflect.ValueOf(object)
if val.CanAddr() {
if reflect.ValueOf(object).IsNil() {
return true
}
} }
if len(message) > 0 { if len(message) > 0 {

64
assert/assertions_test.go
View File

@ -5,10 +5,6 @@ import (
"testing" "testing"
) )
type CustomError struct{}
func (c CustomError) Error() string { return "Error" }
// AssertionTesterInterface defines an interface to be used for testing assertion methods // AssertionTesterInterface defines an interface to be used for testing assertion methods
type AssertionTesterInterface interface { type AssertionTesterInterface interface {
TestMethod() TestMethod()
@ -119,54 +115,6 @@ func TestNil(t *testing.T) {
} }
func TestNil_ValueType(t *testing.T) {
f := func() AssertionTesterConformingObject {
return AssertionTesterConformingObject{}
}
mockT := new(testing.T)
obj := f()
False(t, Nil(mockT, obj))
}
func TestNil_ValueType_IsNil(t *testing.T) {
f := func() AssertionTesterInterface {
return nil
}
mockT := new(testing.T)
obj := f()
True(t, Nil(mockT, obj))
}
func TestNil_ValueError(t *testing.T) {
f := func() error {
return CustomError{}
}
mockT := new(testing.T)
obj := f()
False(t, Nil(mockT, obj))
}
func TestNotNil_ValueError(t *testing.T) {
f := func() error {
return CustomError{}
}
mockT := new(testing.T)
obj := f()
True(t, NotNil(mockT, obj))
}
func TestTrue(t *testing.T) { func TestTrue(t *testing.T) {
mockT := new(testing.T) mockT := new(testing.T)
@ -385,15 +333,3 @@ func TestNotEmpty(t *testing.T) {
True(t, NotEmpty(mockT, true), "True value is not empty") True(t, NotEmpty(mockT, true), "True value is not empty")
} }
func TestEmpty_Value(t *testing.T) {
f := func() error {
return CustomError{}
}
mockT := new(testing.T)
obj := f()
False(t, Empty(mockT, obj))
}