GOMODULES/testify
1
0
Fork 0
mirror of https://github.com/stretchr/testify.git synced 2025-04-27 13:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239 from anacrolix/master

Browse Source 
Avoid panic when calling EqualValues with nil
This commit is contained in:
Ernesto Jiménez 2015-11-07 12:43:16 +00:00
commit 82616deabd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assert/assertions.go
View File

@ -51,8 +51,11 @@ func ObjectsAreEqualValues(expected, actual interface{}) bool {
} }
actualType := reflect.TypeOf(actual) actualType := reflect.TypeOf(actual)
if actualType == nil {
return false
}
expectedValue := reflect.ValueOf(expected) expectedValue := reflect.ValueOf(expected)
if expectedValue.Type().ConvertibleTo(actualType) { if expectedValue.IsValid() && expectedValue.Type().ConvertibleTo(actualType) {
// Attempt comparison after type conversion // Attempt comparison after type conversion
return reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual) return reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual)
} }

6
assert/assertions_test.go
View File

@ -132,6 +132,12 @@ func TestObjectsAreEqual(t *testing.T) {
if !ObjectsAreEqualValues(uint32(10), int32(10)) { if !ObjectsAreEqualValues(uint32(10), int32(10)) {
t.Error("ObjectsAreEqualValues should return true") t.Error("ObjectsAreEqualValues should return true")
} }
if ObjectsAreEqualValues(0, nil) {
t.Fail()
}
if ObjectsAreEqualValues(nil, 0) {
t.Fail()
}
} }