Merge pull request #94 from neilconway/object-equality-golang-1.4

Avoid relying on undefined behavior in assert.ObjectsAreEqual().
stretchr · Nov 24, 2014 · faedd6e · faedd6e
2 parents 8ce79b9 + 49c5c6c
commit faedd6e
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/assert/assertions.go b/assert/assertions.go
@@ -36,15 +36,13 @@ func ObjectsAreEqual(expected, actual interface{}) bool {
 		return true
 	}
 
-	expectedValue := reflect.ValueOf(expected)
-	actualValue := reflect.ValueOf(actual)
-	if expectedValue == actualValue {
-		return true
-	}
-
-	// Attempt comparison after type conversion
-	if actualValue.Type().ConvertibleTo(expectedValue.Type()) && expectedValue == actualValue.Convert(expectedValue.Type()) {
-		return true
+	actualType := reflect.TypeOf(actual)
+	if reflect.TypeOf(actual).ConvertibleTo(reflect.TypeOf(expected)) {
+		expectedValue := reflect.ValueOf(expected)
+		// Attempt comparison after type conversion
+		if actual == expectedValue.Convert(actualType).Interface() {
+			return true
+		}
 	}
 
 	// Last ditch effort