Remove unnecessary branches.

reflect.DeepEqual already returns exactly what we want in both of these cases.
pull/211/head
James Aguilar 2015-08-28 15:09:49 -07:00
parent 7c2b1e5640
commit 1cb1359759
1 changed files with 2 additions and 8 deletions

View File

@ -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