mirror of https://github.com/stretchr/testify.git
Remove unnecessary branches.
reflect.DeepEqual already returns exactly what we want in both of these cases.pull/211/head
parent
7c2b1e5640
commit
1cb1359759
|
@ -35,11 +35,7 @@ func ObjectsAreEqual(expected, actual interface{}) bool {
|
||||||
return expected == actual
|
return expected == actual
|
||||||
}
|
}
|
||||||
|
|
||||||
if reflect.DeepEqual(expected, actual) {
|
return reflect.DeepEqual(expected, actual)
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,9 +50,7 @@ func ObjectsAreEqualValues(expected, actual interface{}) bool {
|
||||||
expectedValue := reflect.ValueOf(expected)
|
expectedValue := reflect.ValueOf(expected)
|
||||||
if expectedValue.Type().ConvertibleTo(actualType) {
|
if expectedValue.Type().ConvertibleTo(actualType) {
|
||||||
// Attempt comparison after type conversion
|
// Attempt comparison after type conversion
|
||||||
if reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual) {
|
return reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual)
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false
|
return false
|
||||||
|
|
Loading…
Reference in New Issue