GODRIVER-1407 Fix enocding of non-string keys (#250)

Author: Divjot Arora

bson/bsoncodec/default_value_encoders_test.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"math"
 	"net/url"
 	"reflect"
 	"testing"
@@ -21,7 +22,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
-	"math"
 )
 
 type myInterface interface {
@@ -217,7 +217,7 @@ func TestDefaultValueEncoders(t *testing.T) {
 		},
 		{
 			"MapEncodeValue",
-			ValueEncoderFunc(dve.MapEncodeValue),
+			defaultMapCodec,
 			[]subtest{
 				{
 					"wrong kind",
@@ -227,18 +227,6 @@ func TestDefaultValueEncoders(t *testing.T) {
 					bsonrwtest.Nothing,
 					ValueEncoderError{Name: "MapEncodeValue", Kinds: []reflect.Kind{reflect.Map}, Received: reflect.ValueOf(wrong)},
 				},
-				{
-					"wrong kind (non-string key)",
-					map[int]interface{}{},
-					nil,
-					nil,
-					bsonrwtest.Nothing,
-					ValueEncoderError{
-						Name:     "MapEncodeValue",
-						Kinds:    []reflect.Kind{reflect.Map},
-						Received: reflect.ValueOf(map[int]interface{}{}),
-					},
-				},
 				{
 					"WriteDocument Error",
 					map[string]interface{}{},
@@ -295,6 +283,16 @@ func TestDefaultValueEncoders(t *testing.T) {
 					bsonrwtest.WriteDocumentEnd,
 					nil,
 				},
+				{
+					"non-string key success",
+					map[int]interface{}{
+						1: "foobar",
+					},
+					&EncodeContext{Registry: buildDefaultRegistry()},
+					&bsonrwtest.ValueReaderWriter{},
+					bsonrwtest.WriteDocumentEnd,
+					nil,
+				},
 			},
 		},
 		{

bson/bsoncodec/map_codec.go

@@ -85,7 +85,7 @@ func (mc *MapCodec) mapEncodeValue(ec EncodeContext, dw bsonrw.DocumentWriter, v
 			return lookupErr
 		}
 
-		vw, err := dw.WriteDocumentElement(key.String())
+		vw, err := dw.WriteDocumentElement(keyStr)
 		if err != nil {
 			return err
 		}