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

Merge pull request #232 from stretchr/issue-136 

Fix #136 - Empty returns true for nil pointers
pull/239/head
Ernesto Jiménez 2015-11-07 04:46:19 +00:00
parent a22a0ef717 c478a808a1
commit a76410419d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assert/assertions.go
View File

@ -362,6 +362,9 @@ func isEmpty(object interface{}) bool {
} }
case reflect.Ptr: case reflect.Ptr:
{ {
if objValue.IsNil() {
return true
}
switch object.(type) { switch object.(type) {
case *time.Time: case *time.Time:
return object.(*time.Time).IsZero() return object.(*time.Time).IsZero()

7
assert/assertions_test.go
View File

@ -4,6 +4,7 @@ import (
"errors" "errors"
"io" "io"
"math" "math"
"os"
"reflect" "reflect"
"regexp" "regexp"
"testing" "testing"
@ -580,6 +581,9 @@ func TestEmpty(t *testing.T) {
mockT := new(testing.T) mockT := new(testing.T)
chWithValue := make(chan struct{}, 1) chWithValue := make(chan struct{}, 1)
chWithValue <- struct{}{} chWithValue <- struct{}{}
var ti *time.Time
var s *string
var f *os.File
True(t, Empty(mockT, ""), "Empty string is empty") True(t, Empty(mockT, ""), "Empty string is empty")
True(t, Empty(mockT, nil), "Nil is empty") True(t, Empty(mockT, nil), "Nil is empty")
@ -587,6 +591,9 @@ func TestEmpty(t *testing.T) {
True(t, Empty(mockT, 0), "Zero int value is empty") True(t, Empty(mockT, 0), "Zero int value is empty")
True(t, Empty(mockT, false), "False value is empty") True(t, Empty(mockT, false), "False value is empty")
True(t, Empty(mockT, make(chan struct{})), "Channel without values is empty") True(t, Empty(mockT, make(chan struct{})), "Channel without values is empty")
True(t, Empty(mockT, s), "Nil string pointer is empty")
True(t, Empty(mockT, f), "Nil os.File pointer is empty")
True(t, Empty(mockT, ti), "Nil time.Time pointer is empty")
False(t, Empty(mockT, "something"), "Non Empty string is not empty") False(t, Empty(mockT, "something"), "Non Empty string is not empty")
False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty") False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")