update tests

Author: qingyang-hu

bson/encoder_test.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 	"reflect"
 	"testing"
+	"time"
 
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/require"
@@ -251,7 +252,7 @@ func TestEncoderConfiguration(t *testing.T) {
 		// Test that OmitZeroStruct omits empty structs from the marshaled document if
 		// OmitEmpty is also set.
 		{
-			description: "OmitEmpty",
+			description: "OmitEmpty with non-zeroer struct",
 			configure: func(enc *Encoder) {
 				enc.OmitZeroStruct()
 				enc.OmitEmpty()
@@ -261,6 +262,29 @@ func TestEncoderConfiguration(t *testing.T) {
 			}{},
 			want: bsoncore.NewDocumentBuilder().Build(),
 		},
+		// Test that OmitEmpty omits empty values from the marshaled document.
+		{
+			description: "OmitEmpty",
+			configure: func(enc *Encoder) {
+				enc.OmitEmpty()
+			},
+			input: struct {
+				Zero    zeroTest
+				I64     int64
+				F64     float64
+				String  string
+				Boolean bool
+				Slice   []int
+				Array   [0]int
+				Map     map[string]int
+				Bytes   []byte
+				Time    time.Time
+				Pointer *int
+			}{
+				Zero: zeroTest{true},
+			},
+			want: bsoncore.NewDocumentBuilder().Build(),
+		},
 		// Test that UseJSONStructTags causes the Encoder to fall back to "json" struct tags if
 		// "bson" struct tags are not available.
 		{

bson/primitive_codecs_test.go

@@ -1094,6 +1094,8 @@ type zeroTest struct {
 
 func (z zeroTest) IsZero() bool { return z.reportZero }
 
+var _ Zeroer = zeroTest{}
+
 func compareZeroTest(_, _ zeroTest) bool { return true }
 
 func compareDecimal128(d1, d2 Decimal128) bool {

bson/struct_codec_test.go

@@ -14,16 +14,6 @@ import (
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 )
 
-var _ Zeroer = testZeroer{}
-
-type testZeroer struct {
-	val int
-}
-
-func (z testZeroer) IsZero() bool {
-	return z.val != 0
-}
-
 func TestIsZero(t *testing.T) {
 	t.Parallel()
 	testCases := []struct {
@@ -84,22 +74,22 @@ func TestIsZero(t *testing.T) {
 		},
 		{
 			description: "zero struct that implements Zeroer",
-			value:       testZeroer{},
+			value:       zeroTest{},
 			want:        false,
 		},
 		{
 			description: "non-zero struct that implements Zeroer",
-			value:       &testZeroer{val: 1},
+			value:       zeroTest{reportZero: true},
 			want:        true,
 		},
 		{
 			description: "pointer to zero struct that implements Zeroer",
-			value:       &testZeroer{},
+			value:       &zeroTest{},
 			want:        false,
 		},
 		{
 			description: "pointer to non-zero struct that implements Zeroer",
-			value:       testZeroer{val: 1},
+			value:       &zeroTest{reportZero: true},
 			want:        true,
 		},
 		{

internal/integration/client_test.go

@@ -957,7 +957,7 @@ func TestClient_BSONOptions(t *testing.T) {
 			wantRaw:    bson.Raw(bsoncore.NewDocumentBuilder().Build()),
 		},
 		{
-			name: "OmitEmpty",
+			name: "OmitEmpty with non-zeroer struct",
 			bsonOpts: &options.BSONOptions{
 				OmitZeroStruct: true,
 				OmitEmpty:      true,