ObjectsExportedFieldsAreEqual: Handle nested pointer fields

stretchr · Apr 21, 2023 · fe1ef96 · fe1ef96
1 parent c5fc9d6
commit fe1ef96
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/assert/assertions.go b/assert/assertions.go
@@ -102,11 +102,20 @@ func ObjectsExportedFieldsAreEqual(expected, actual interface{}) bool {
 		field := expectedType.Field(i)
 		isExported := field.PkgPath == "" // should use field.IsExported() but it's not available in Go 1.16.5
 		if isExported {
+			expectedField := expectedValue.Field(i)
+			actualField := actualValue.Field(i)
+
 			var equal bool
-			if field.Type.Kind() == reflect.Struct {
-				equal = ObjectsExportedFieldsAreEqual(expectedValue.Field(i).Interface(), actualValue.Field(i).Interface())
-			} else {
-				equal = ObjectsAreEqualValues(expectedValue.Field(i).Interface(), actualValue.Field(i).Interface())
+			switch field.Type.Kind() {
+			case reflect.Struct:
+				equal = ObjectsExportedFieldsAreEqual(expectedField.Interface(), actualField.Interface())
+			case reflect.Ptr:
+				if expectedField.IsNil() || actualField.IsNil() {
+					return expectedField == actualField
+				}
+				equal = ObjectsExportedFieldsAreEqual(expectedField.Elem().Interface(), actualField.Elem().Interface())
+			default:
+				equal = ObjectsAreEqualValues(expectedField.Interface(), actualField.Interface())
 			}
 
 			if !equal {

diff --git a/assert/assertions_test.go b/assert/assertions_test.go
@@ -166,6 +166,10 @@ func TestObjectsExportedFieldsAreEqual(t *testing.T) {
 		foo interface{}
 	}
 
+	type S3 struct {
+		ExportedPointer *Nested
+	}
+
 	cases := []struct {
 		expected interface{}
 		actual   interface{}
@@ -180,6 +184,11 @@ func TestObjectsExportedFieldsAreEqual(t *testing.T) {
 		{S{1, Nested{2, 3}, 4, Nested{5, 6}}, S{1, Nested{"a", 3}, 4, Nested{5, 6}}, false},
 		{S{1, Nested{2, 3}, 4, Nested{5, 6}}, S2{1}, false},
 		{1, S{1, Nested{2, 3}, 4, Nested{5, 6}}, false},
+		{S3{&Nested{2, 3}}, S3{&Nested{2, 3}}, true},
+		{S3{&Nested{2, 3}}, S3{&Nested{2, 4}}, true},
+		{S3{&Nested{2, 3}}, S3{&Nested{"a", 3}}, false},
+		{S3{&Nested{2, 3}}, S3{}, false},
+		{S3{}, S3{}, true},
 	}
 
 	for _, c := range cases {