replacing NoFieldIsEmpty with NoFieldIsZero

Author: PeterEFinch

assert/assertion_format.go

@@ -2275,18 +2275,21 @@ func buildErrorChainString(err error, withType bool) string {
 	return chain
 }
 
-// NoFieldIsEmpty asserts that object, which must be a struct or eventually
-// reference to one, has no exported field with a value that is empty (following
-// the definition of empty used in [Empty]).
-func NoFieldIsEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
-	if reflect.TypeOf(object).Kind() == reflect.Ptr {
-		return NoFieldIsEmpty(t, reflect.ValueOf(object).Elem().Interface(), msgAndArgs)
-	}
-
+// NoFieldIsZero asserts that object, which must be a struct or eventually
+// reference to one, has no exported field with a value that is zero.
+//
+// The assertion is not recursive, meaning it only checks that the exported
+// fields of the struct (including any embedded structs) are not zero values.
+// It does not check any fields of nested or embedded structs.
+func NoFieldIsZero(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if h, ok := t.(tHelper); ok {
 		h.Helper()
 	}
 
+	if reflect.TypeOf(object).Kind() == reflect.Ptr {
+		return NoFieldIsZero(t, reflect.ValueOf(object).Elem().Interface(), msgAndArgs)
+	}
+
 	objectType := reflect.TypeOf(object)
 	if objectType.Kind() != reflect.Struct {
 		return Fail(t, "Input must be a struct or eventually reference one", msgAndArgs...)
@@ -2300,13 +2303,13 @@ func NoFieldIsEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) b
 			continue
 		}
 
-		if isEmpty(objectValue.Field(i).Interface()) {
+		if objectValue.Field(i).IsZero() {
 			emptyFields = append(emptyFields, field.Name)
 		}
 	}
 
 	if len(emptyFields) > 0 {
-		return Fail(t, fmt.Sprintf("Object contained empty fields: %s", strings.Join(emptyFields, ", ")), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Object contained fields with zero values: %s", strings.Join(emptyFields, ", ")), msgAndArgs...)
 	}
 
 	return true

assert/assertion_forward.go

@@ -3665,8 +3665,13 @@ func TestNotErrorAs(t *testing.T) {
 	}
 }
 
-func TestNoFieldIsEmpty(t *testing.T) {
+func TestNoFieldIsZero(t *testing.T) {
 	str := "a string"
+	type Embeddable struct {
+		StringA string
+		StringB string
+	}
+
 	tests := []struct {
 		name         string
 		input        interface{}
@@ -3676,23 +3681,25 @@ func TestNoFieldIsEmpty(t *testing.T) {
 		{
 			name: "success",
 			input: struct {
+				Embeddable
 				Float64   float64
 				Func      func()
 				Int       int
 				Interface interface{}
 				Pointer   *string
 				Slice     []string
 				String    string
-				Struct    struct{ String string }
+				Struct    struct{ StringA, StringB string }
 			}{
-				Float64:   1.5,
-				Func:      func() {},
-				Int:       1,
-				Interface: "interface",
-				Pointer:   &str,
-				Slice:     []string{"a", "b"},
-				String:    "a string",
-				Struct:    struct{ String string }{String: "a nested string"},
+				Embeddable: Embeddable{StringA: "string"}, // For Embeddable to be non-zero, only one field its fields needs to be non-zero
+				Float64:    1.5,
+				Func:       func() {},
+				Int:        1,
+				Interface:  "interface",
+				Pointer:    &str,
+				Slice:      []string{"a", "b"},
+				String:     "a string",
+				Struct:     struct{ StringA, StringB string }{StringA: "a nested string"},
 			},
 			result: true,
 		},
@@ -3713,6 +3720,7 @@ func TestNoFieldIsEmpty(t *testing.T) {
 		{
 			name: "failure",
 			input: struct {
+				Embeddable
 				Float64   float64
 				Func      func()
 				Int       int
@@ -3723,7 +3731,7 @@ func TestNoFieldIsEmpty(t *testing.T) {
 				Struct    struct{ String string }
 			}{},
 			result:       false,
-			resultErrMsg: "Object contained empty fields: Float64, Func, Int, Interface, Pointer, Slice, String, Struct\n",
+			resultErrMsg: "Object contained fields with zero values: Embeddable, Float64, Func, Int, Interface, Pointer, Slice, String, Struct\n",
 		},
 		{
 			name: "failure_partial",
@@ -3732,7 +3740,7 @@ func TestNoFieldIsEmpty(t *testing.T) {
 				StringB string
 			}{StringA: "not_empty"},
 			result:       false,
-			resultErrMsg: "Object contained empty fields: StringB\n",
+			resultErrMsg: "Object contained fields with zero values: StringB\n",
 		},
 		{
 			name:         "failure_wrong_type",
@@ -3744,7 +3752,7 @@ func TestNoFieldIsEmpty(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockT := new(captureTestingT)
-			result := NoFieldIsEmpty(mockT, tt.input)
+			result := NoFieldIsZero(mockT, tt.input)
 			mockT.checkResultAndErrMsg(t, tt.result, result, tt.resultErrMsg)
 		})
 	}